diff --git a/code/modules/modular_computers/file_system/programs/dept_order.dm b/code/modules/modular_computers/file_system/programs/dept_order.dm index 405e202e30949..4fea992417668 100644 --- a/code/modules/modular_computers/file_system/programs/dept_order.dm +++ b/code/modules/modular_computers/file_system/programs/dept_order.dm @@ -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)) @@ -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] diff --git a/modular_lethal_doppler/paxilweapons_real/code/ammo_stacks/chinmoku_12mm.dm b/modular_lethal_doppler/paxilweapons_real/code/ammo_stacks/chinmoku_12mm.dm index 401b119b38a20..cfbcb882c4000 100644 --- a/modular_lethal_doppler/paxilweapons_real/code/ammo_stacks/chinmoku_12mm.dm +++ b/modular_lethal_doppler/paxilweapons_real/code/ammo_stacks/chinmoku_12mm.dm @@ -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 @@ -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 diff --git a/modular_lethal_doppler/paxilweapons_real/code/guns/random_things_in_cases.dm b/modular_lethal_doppler/paxilweapons_real/code/guns/random_things_in_cases.dm index 41cfa7a7230c6..28273342abf86 100644 --- a/modular_lethal_doppler/paxilweapons_real/code/guns/random_things_in_cases.dm +++ b/modular_lethal_doppler/paxilweapons_real/code/guns/random_things_in_cases.dm @@ -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 diff --git a/modular_lethal_doppler/paxilweapons_real/code/guns/ransu.dm b/modular_lethal_doppler/paxilweapons_real/code/guns/ransu.dm index 0875e791c623c..65f98a1d79c7c 100644 --- a/modular_lethal_doppler/paxilweapons_real/code/guns/ransu.dm +++ b/modular_lethal_doppler/paxilweapons_real/code/guns/ransu.dm @@ -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 diff --git a/modular_lethal_doppler/wallem/code/floor_tiles.dm b/modular_lethal_doppler/wallem/code/floor_tiles.dm index 2f17e39ec8172..525ab447d7cb0 100644 --- a/modular_lethal_doppler/wallem/code/floor_tiles.dm +++ b/modular_lethal_doppler/wallem/code/floor_tiles.dm @@ -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 diff --git a/modular_lethal_doppler/wallem/code/windows.dm b/modular_lethal_doppler/wallem/code/windows.dm index 8322763258575..e136aff8f8876 100644 --- a/modular_lethal_doppler/wallem/code/windows.dm +++ b/modular_lethal_doppler/wallem/code/windows.dm @@ -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' diff --git a/tgstation.dme b/tgstation.dme index 4741d3d100249..a4b5768fd6a15 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -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"