Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes everything #6

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,10 @@
linked_department = department
var/datum/job_department/linked_department_real = SSjob.get_department_type(linked_department)
// Heads of staff can download
download_access |= linked_department_real.head_of_staff_access
download_access |= linked_department_real?.head_of_staff_access // DOPPLETHAL EDIT - download_access |= linked_department_real.head_of_staff_access
// Heads of staff + anyone in the dept can run it
use_access |= linked_department_real.head_of_staff_access
use_access |= linked_department_real.department_access
use_access |= linked_department_real?.head_of_staff_access // DOPPLETHAL EDIT - use_access |= linked_department_real.head_of_staff_access
use_access |= linked_department_real?.department_access // DOPPLETHAL EDIT - use_access |= linked_department_real.department_access
// Also set up the radio
if(dept_to_radio[linked_department])
if(!isnull(radio))
Expand Down Expand Up @@ -134,7 +134,7 @@
return null
var/list/access_to_depts = list()
for(var/datum/job_department/department as anything in department_cooldowns)
access_to_depts[initial(department.head_of_staff_access)] = department
access_to_depts[initial(department?.head_of_staff_access)] = department // DOPPLETHLA EDIT - access_to_depts[initial(department.head_of_staff_access)] = department
for(var/access_key in id_card.GetAccess())
if(access_to_depts[access_key])
return access_to_depts[access_key]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
This one has been modified to fit the dimensionally-close-enough 12mm Chinmoku casings. \
A white line has been added to indicate you should not try using this in standard sol rifles."
icon = 'modular_lethal_doppler/paxilweapons_real/icons/magazines_and_boxes.dmi'
icon_state = "rifle_short"
icon_state = "rifle_alt_short"
multiple_sprites = AMMO_BOX_FULL_EMPTY
w_class = WEIGHT_CLASS_TINY
ammo_type = /obj/item/ammo_casing/c12chinmoku
Expand All @@ -51,7 +51,7 @@
desc = "A standard size magazine for SolFed rifles, holds thirty rounds. \
This one has been modified to fit the dimensionally-close-enough 12mm Chinmoku casings. \
A white line has been added to indicate you should not try using this in standard sol rifles."
icon_state = "rifle_standard"
icon_state = "rifle_alt_standard"
w_class = WEIGHT_CLASS_SMALL
max_ammo = 30

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,13 +69,13 @@
// It doesn't miss

/obj/item/gun/ballistic/shotgun/riot/sol/thunderdome
accepted_magazine_type = /obj/item/ammo_box/magazine/internal/shot/riot/sol_thunderdome
spawn_magazine_type = /obj/item/ammo_box/magazine/internal/shot/riot/sol/thunderdome

/obj/item/ammo_box/magazine/internal/shot/riot/sol_thunderdome
/obj/item/ammo_box/magazine/internal/shot/riot/sol/thunderdome
ammo_type = /obj/item/ammo_casing/lethal_s12gauge

/obj/item/gun/ballistic/shotgun/riot/sol/evil/thunderdome
accepted_magazine_type = /obj/item/ammo_box/magazine/internal/shot/riot/sol_thunderdome/evil
spawn_magazine_type = /obj/item/ammo_box/magazine/internal/shot/riot/sol/thunderdome/evil

/obj/item/ammo_box/magazine/internal/shot/riot/sol_thunderdome/evil
/obj/item/ammo_box/magazine/internal/shot/riot/sol/thunderdome/evil
ammo_type = /obj/item/ammo_casing/lethal_s12gauge/flechette
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
rack_sound = 'modular_lethal_doppler/paxilweapons_real/sound/ransu/ransu_rack.wav'
fire_sound = 'modular_lethal_doppler/paxilweapons_real/sound/ransu/ransu.wav'
suppressed_sound = 'modular_lethal_doppler/paxilweapons_real/sound/ransu/ransu.wav'
special_mags = FALSE
can_suppress = TRUE
can_unsuppress = FALSE
fire_delay = 1.5 SECONDS
Expand Down
106 changes: 106 additions & 0 deletions modular_lethal_doppler/wallem/code/floor_tiles.dm
Original file line number Diff line number Diff line change
@@ -1,5 +1,111 @@
#define TG_TILE_FILE 'icons/turf/floors.dmi'

/turf/open/floor/plating
icon = 'modular_lethal_doppler/wallem/icons/floors.dmi'

/turf/open/floor/plating/foam
icon = TG_TILE_FILE

/turf/open/floor/plating/reinforced
icon = TG_TILE_FILE

/turf/open/floor/plating/abductor
icon = TG_TILE_FILE

/turf/open/floor/plating/abductor2
icon = TG_TILE_FILE

/turf/open/floor/plating/elevatorshaft
icon = TG_TILE_FILE

/turf/open/floor/iron
icon = 'modular_lethal_doppler/wallem/icons/floors.dmi'

/turf/open/floor/iron/small
icon = TG_TILE_FILE

/turf/open/floor/iron/herringbone
icon = TG_TILE_FILE

/turf/open/floor/iron/dark/small
icon = TG_TILE_FILE

/turf/open/floor/iron/dark/herringbone
icon = TG_TILE_FILE

/turf/open/floor/iron/white/side
icon = TG_TILE_FILE

/turf/open/floor/iron/white/corner
icon = TG_TILE_FILE

/turf/open/floor/iron/white/small
icon = TG_TILE_FILE

/turf/open/floor/iron/white/herringbone
icon = TG_TILE_FILE

/turf/open/floor/iron/cafeteria
icon = TG_TILE_FILE

/turf/open/floor/iron/recharge_floor
icon = TG_TILE_FILE

/turf/open/floor/iron/smooth
icon = TG_TILE_FILE

/turf/open/floor/iron/smooth_edge
icon = TG_TILE_FILE

/turf/open/floor/iron/smooth_half
icon = TG_TILE_FILE

/turf/open/floor/iron/smooth_corner
icon = TG_TILE_FILE

/turf/open/floor/iron/smooth_large
icon = TG_TILE_FILE

/turf/open/floor/iron/terracotta
icon = TG_TILE_FILE

/turf/open/floor/iron/kitchen
icon = TG_TILE_FILE

/turf/open/floor/iron/chapel
icon = TG_TILE_FILE

/turf/open/floor/iron/showroomfloor
icon = TG_TILE_FILE

/turf/open/floor/iron/solarpanel
icon = TG_TILE_FILE

/turf/open/floor/iron/freezer
icon = TG_TILE_FILE

/turf/open/floor/iron/kitchen_coldroom
icon = TG_TILE_FILE

/turf/open/floor/iron/grimy
icon = TG_TILE_FILE

/turf/open/floor/iron/vaporwave
icon = TG_TILE_FILE

/turf/open/floor/iron/goonplaque
icon = TG_TILE_FILE

/turf/open/floor/iron/stairs
icon = TG_TILE_FILE

/turf/open/floor/iron/bluespace
icon = TG_TILE_FILE

/turf/open/floor/iron/sepia
icon = TG_TILE_FILE

/turf/open/floor/iron/tgmcemblem
icon = TG_TILE_FILE

#undef TG_TILE_FILE
6 changes: 6 additions & 0 deletions modular_lethal_doppler/wallem/code/windows.dm
Original file line number Diff line number Diff line change
Expand Up @@ -239,3 +239,9 @@
if(fulltile)
return ..()
smoothing_junction = new_junction

/obj/structure/window/plasma
icon = 'icons/obj/structures.dmi'

/obj/structure/window/reinforced
icon = 'icons/obj/structures.dmi'
1 change: 1 addition & 0 deletions tgstation.dme
Original file line number Diff line number Diff line change
Expand Up @@ -7140,6 +7140,7 @@
#include "modular_doppler\religion\code\mind.dm"
#include "modular_doppler\religion\code\religious_sects.dm"
#include "modular_doppler\research\designs\limbgrower_designs.dm"
#include "modular_doppler\stone\code\ore_veins.dm"
#include "modular_doppler\stone\code\stone.dm"
#include "modular_doppler\tableflip\tableflip.dm"
#include "modular_doppler\time_clock\code\console.dm"
Expand Down
Loading