From 7b3b8fb419792cd51dc14594668467daf88837e3 Mon Sep 17 00:00:00 2001 From: Erki Date: Thu, 3 Aug 2017 23:25:56 +0300 Subject: [PATCH 1/6] :ree:verts genetics (#3219) --- code/game/jobs/job/science.dm | 4 +- html/changelogs/skull132-bybebye_genetics.yml | 5 + maps/aurora/aurora-3_sublevel.dmm | 126 ++-- maps/aurora/aurora-4_mainlevel.dmm | 537 +++++++++++------- 4 files changed, 395 insertions(+), 277 deletions(-) create mode 100644 html/changelogs/skull132-bybebye_genetics.yml diff --git a/code/game/jobs/job/science.dm b/code/game/jobs/job/science.dm index 5c6cccef982..d685dff91b9 100644 --- a/code/game/jobs/job/science.dm +++ b/code/game/jobs/job/science.dm @@ -137,8 +137,8 @@ department = "Science" department_flag = MEDSCI faction = "Station" - total_positions = 2 - spawn_positions = 2 + total_positions = 0 + spawn_positions = 0 supervisors = "the research director" selection_color = "#ffeeff" economic_modifier = 7 diff --git a/html/changelogs/skull132-bybebye_genetics.yml b/html/changelogs/skull132-bybebye_genetics.yml new file mode 100644 index 00000000000..c32eb52f1d2 --- /dev/null +++ b/html/changelogs/skull132-bybebye_genetics.yml @@ -0,0 +1,5 @@ +author: Skull132 +delete-after: true + +changes: + - rscdel: "Genetics has been removed again." diff --git a/maps/aurora/aurora-3_sublevel.dmm b/maps/aurora/aurora-3_sublevel.dmm index b7e003bcdad..dc394ef79db 100644 --- a/maps/aurora/aurora-3_sublevel.dmm +++ b/maps/aurora/aurora-3_sublevel.dmm @@ -16974,19 +16974,14 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, /obj/structure/cable/green{ d1 = 1; d2 = 4; icon_state = "1-4" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, /turf/simulated/floor/tiled/white, /area/outpost/research/hallway) "CR" = ( @@ -17449,19 +17444,14 @@ /turf/simulated/floor/tiled/white, /area/outpost/research/hallway) "DC" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, /obj/effect/floor_decal/corner/mauve{ icon_state = "corner_white"; dir = 10 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + icon_state = "intact-scrubbers"; + dir = 9 + }, /turf/simulated/floor/tiled/white, /area/outpost/research/hallway) "DD" = ( @@ -42566,10 +42556,10 @@ AW AW AW rq -Et -Fi -FR -Ec +aa +aa +aa +aa aa aa aa @@ -42823,10 +42813,10 @@ AW AW AW rq -Et -Fj -Et -Ec +aa +aa +aa +aa aa aa aa @@ -43080,10 +43070,10 @@ AW AW AW rq -Et -Et -Et -Ec +aa +aa +aa +aa aa aa aa @@ -43337,12 +43327,12 @@ rq rq rq rq -Eu -Fk -Eu -Ec -Ec -Ec +aa +aa +aa +aa +aa +aa aa aa aa @@ -43593,13 +43583,13 @@ pl pl pl DB -Ec -Ev -Fl -Fl -GJ -Hw -Ec +rq +aa +aa +aa +aa +aa +aa aa aa aa @@ -43850,13 +43840,13 @@ BF pJ CQ DC -Ed -Ew -Fm -FS -GK -Hx -Ec +rq +aa +aa +aa +aa +aa +aa aa aa aa @@ -44107,13 +44097,13 @@ BG qe CR DD -Ec -Ex -Fn -FT -GL -Hy -Ec +rq +aa +aa +aa +aa +aa +aa aa aa aa @@ -44365,12 +44355,12 @@ xk CS xk xk -Ey -Fn -FU -GM -Hz -Ec +aa +aa +aa +aa +aa +aa aa aa aa @@ -44622,12 +44612,12 @@ Co CT DE xk -Ez -Fo -FV -GN -HA -Ec +aa +aa +aa +aa +aa +aa aa aa aa diff --git a/maps/aurora/aurora-4_mainlevel.dmm b/maps/aurora/aurora-4_mainlevel.dmm index 82f83cc1371..8215b293a29 100644 --- a/maps/aurora/aurora-4_mainlevel.dmm +++ b/maps/aurora/aurora-4_mainlevel.dmm @@ -49430,7 +49430,7 @@ /area/crew_quarters/sleep/research) "bGq" = ( /turf/simulated/wall/r_wall, -/area/medical/genetics) +/area/rnd/telesci) "bGr" = ( /obj/structure/grille, /obj/structure/window/reinforced, @@ -49445,12 +49445,8 @@ }, /obj/machinery/door/firedoor, /turf/simulated/floor/plating, -/area/medical/genetics) +/area/rnd/telesci) "bGs" = ( -/obj/machinery/door/airlock/glass_research{ - name = "Genetics Lab"; - req_access = list(9) - }, /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -49460,8 +49456,12 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, +/obj/machinery/door/airlock/research{ + name = "Miscellaneous Research Room"; + req_one_access = list(7,29) + }, /turf/simulated/floor/tiled/white, -/area/medical/genetics) +/area/rnd/telesci) "bGt" = ( /obj/structure/grille, /obj/structure/window/reinforced, @@ -49476,7 +49476,7 @@ }, /obj/machinery/door/firedoor, /turf/simulated/floor/plating, -/area/medical/genetics) +/area/rnd/telesci) "bGu" = ( /obj/machinery/atmospherics/portables_connector{ dir = 4 @@ -49897,33 +49897,22 @@ /turf/simulated/open, /area/turbolift/research_station) "bHd" = ( -/obj/structure/table/standard, -/obj/item/weapon/storage/box/disks, -/obj/item/device/flashlight/pen, /obj/machinery/newscaster{ pixel_y = 32 }, -/obj/effect/floor_decal/corner/mauve/full{ - icon_state = "corner_white_full"; - dir = 8 - }, -/obj/machinery/light_switch{ - pixel_x = -23; - pixel_y = 0 +/obj/effect/floor_decal/corner/mauve{ + icon_state = "corner_white"; + dir = 5 }, /turf/simulated/floor/tiled/white, -/area/medical/genetics) +/area/rnd/telesci) "bHe" = ( /obj/effect/floor_decal/corner/mauve{ icon_state = "corner_white"; dir = 5 }, -/obj/machinery/disposal, -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, /turf/simulated/floor/tiled/white, -/area/medical/genetics) +/area/rnd/telesci) "bHf" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -49932,21 +49921,13 @@ d2 = 4; icon_state = "1-4" }, -/obj/effect/floor_decal/corner/mauve{ - icon_state = "corner_white"; - dir = 5 - }, /obj/structure/disposalpipe/segment{ - dir = 8; + dir = 1; icon_state = "pipe-c" }, /turf/simulated/floor/tiled/white, -/area/medical/genetics) +/area/rnd/telesci) "bHg" = ( -/obj/structure/table/standard, -/obj/item/weapon/storage/box/bodybags, -/obj/item/weapon/hand_labeler, -/obj/machinery/atmospherics/unary/vent_pump/on, /obj/structure/cable/green{ d1 = 4; d2 = 8; @@ -49959,12 +49940,14 @@ icon_state = "corner_white"; dir = 5 }, +/obj/machinery/disposal, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, /turf/simulated/floor/tiled/white, -/area/medical/genetics) +/area/rnd/telesci) "bHh" = ( /obj/structure/table/standard, -/obj/item/weapon/storage/box/disks, -/obj/item/device/flashlight/pen, /obj/structure/cable/green{ d2 = 8; icon_state = "0-8" @@ -49985,7 +49968,7 @@ pixel_y = 0 }, /turf/simulated/floor/tiled/white, -/area/medical/genetics) +/area/rnd/telesci) "bHi" = ( /obj/machinery/computer/general_air_control{ name = "Chamber Gas Sensor"; @@ -50309,36 +50292,23 @@ /turf/simulated/floor/plating, /area/maintenance/research_port) "bHU" = ( -/obj/structure/table/standard, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, -/obj/machinery/atmospherics/unary/vent_pump/on{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/effect/floor_decal/corner/mauve{ - icon_state = "corner_white"; - dir = 9 - }, -/obj/machinery/requests_console{ - department = "Genetics Lab"; - departmentType = 2; - name = "Requests Console"; - pixel_x = -32; - pixel_y = 0 - }, +/obj/structure/bed/chair/office/light, /turf/simulated/floor/tiled/white, -/area/medical/genetics) +/area/rnd/telesci) "bHV" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /turf/simulated/floor/tiled/white, -/area/medical/genetics) +/area/rnd/telesci) "bHW" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/white, -/area/medical/genetics) +/area/rnd/telesci) "bHX" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 @@ -50350,7 +50320,7 @@ /obj/item/weapon/paper_bin, /obj/item/weapon/pen, /obj/machinery/camera/network/research{ - c_tag = "Research - Genetics Laboratory"; + c_tag = "Research - Telescience Laboratory"; dir = 8; network = list("Research") }, @@ -50362,8 +50332,11 @@ pixel_x = 24; pixel_y = 0 }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, /turf/simulated/floor/tiled/white, -/area/medical/genetics) +/area/rnd/telesci) "bHZ" = ( /obj/machinery/camera/network/research{ c_tag = "Research - Miscellaneous Gas Controller"; @@ -50646,47 +50619,49 @@ /turf/simulated/floor/plating, /area/maintenance/research_port) "bIJ" = ( -/obj/machinery/computer/scan_consolenew, -/obj/item/device/radio/intercom{ - pixel_x = -27 - }, -/obj/effect/floor_decal/corner/mauve{ - icon_state = "corner_white"; - dir = 9 - }, -/turf/simulated/floor/tiled/white, -/area/medical/genetics) -"bIK" = ( -/obj/structure/bed/chair/office/dark{ +/obj/effect/floor_decal/corner/mauve/diagonal, +/obj/effect/floor_decal/corner/mauve/diagonal{ + icon_state = "corner_white_diagonal"; dir = 8 }, -/turf/simulated/floor/tiled/white, -/area/medical/genetics) -"bIL" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/floor_decal/corner/mauve{ - icon_state = "corner_white"; - dir = 10 +/obj/machinery/computer/telescience{ + starting_crystals = 3 }, /turf/simulated/floor/tiled/white, -/area/medical/genetics) -"bIM" = ( -/obj/structure/bed/chair/office/dark{ +/area/rnd/telesci) +"bIK" = ( +/obj/structure/table/reinforced, +/obj/item/device/gps/science, +/obj/item/device/gps/science, +/obj/item/device/gps/science, +/obj/item/device/gps/science, +/obj/effect/floor_decal/corner/mauve/diagonal, +/obj/effect/floor_decal/corner/mauve/diagonal{ + icon_state = "corner_white_diagonal"; + dir = 8 + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, /turf/simulated/floor/tiled/white, -/area/medical/genetics) -"bIN" = ( -/obj/machinery/computer/scan_consolenew, -/obj/item/device/radio/intercom{ - pixel_x = 27 +/area/rnd/telesci) +"bIL" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 }, +/turf/simulated/floor/tiled/white, +/area/rnd/telesci) +"bIM" = ( +/turf/simulated/floor/tiled/white, +/area/rnd/telesci) +"bIN" = ( /obj/effect/floor_decal/corner/mauve{ icon_state = "corner_white"; dir = 6 }, +/obj/structure/closet/bombcloset, /turf/simulated/floor/tiled/white, -/area/medical/genetics) +/area/rnd/telesci) "bIO" = ( /obj/machinery/atmospherics/portables_connector{ dir = 4 @@ -51096,12 +51071,8 @@ /area/medical/genetics) "bJH" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/floor_decal/corner/mauve{ - icon_state = "corner_white"; - dir = 5 - }, /turf/simulated/floor/tiled/white, -/area/medical/genetics) +/area/rnd/telesci) "bJI" = ( /obj/effect/floor_decal/corner/mauve/full{ icon_state = "corner_white_full"; @@ -51110,17 +51081,13 @@ /turf/simulated/floor/tiled/white, /area/medical/genetics) "bJJ" = ( -/obj/machinery/dna_scannernew, /obj/effect/floor_decal/corner/mauve{ icon_state = "corner_white"; dir = 6 }, -/obj/effect/floor_decal/corner/mauve{ - icon_state = "corner_white"; - dir = 9 - }, +/obj/machinery/suit_storage_unit/standard_unit, /turf/simulated/floor/tiled/white, -/area/medical/genetics) +/area/rnd/telesci) "bJK" = ( /obj/structure/grille, /obj/structure/window/reinforced/tinted{ @@ -51367,30 +51334,29 @@ /turf/simulated/floor/tiled/white, /area/medical/genetics) "bKm" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + icon_state = "intact-scrubbers"; + dir = 5 }, /turf/simulated/floor/tiled/white, -/area/medical/genetics) +/area/rnd/telesci) "bKn" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/rnd/telesci) +"bKo" = ( /obj/effect/floor_decal/corner/mauve{ icon_state = "corner_white"; dir = 6 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/machinery/portable_atmospherics/powered/pump/filled, /turf/simulated/floor/tiled/white, -/area/medical/genetics) -"bKo" = ( -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/machinery/door/window/westleft{ - req_access = list(9) - }, -/obj/effect/decal/warning_stripes, -/mob/living/carbon/human/monkey, -/turf/simulated/floor/plating, -/area/medical/genetics) +/area/rnd/telesci) "bKp" = ( /obj/machinery/computer/operating{ name = "Robotics Operating Computer" @@ -51646,26 +51612,50 @@ /turf/simulated/floor/plating, /area/maintenance/research_port) "bKQ" = ( -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ +/obj/machinery/door/blast/regular{ + density = 0; + icon_state = "pdoor0"; + id = "telescience"; + name = "Containment Blast Doors"; + opacity = 0 + }, +/obj/machinery/door/firedoor, +/obj/machinery/door/window/northleft, +/obj/machinery/door/window/southright, +/turf/simulated/floor/tiled/dark, +/area/rnd/telesci) +"bKR" = ( +/obj/structure/grille, +/obj/structure/window/phoronreinforced, +/obj/structure/window/phoronreinforced{ + icon_state = "phoronrwindow"; dir = 1 }, -/obj/machinery/door/window/eastright{ - req_access = list(9) +/obj/structure/window/phoronreinforced{ + icon_state = "phoronrwindow"; + dir = 4 }, -/obj/effect/decal/warning_stripes, -/obj/machinery/light{ - dir = 8; - icon_state = "tube1"; - pixel_y = 0 +/obj/structure/window/phoronreinforced{ + icon_state = "phoronrwindow"; + dir = 8 + }, +/obj/machinery/door/blast/regular{ + density = 0; + icon_state = "pdoor0"; + id = "telescience"; + name = "Containment Blast Doors"; + opacity = 0 + }, +/obj/machinery/door/firedoor, +/obj/machinery/door/blast/regular{ + density = 0; + icon_state = "pdoor0"; + id = "Biohazard"; + name = "Biohazard Shutter"; + opacity = 0 }, -/mob/living/carbon/human/farwa, /turf/simulated/floor/plating, -/area/medical/genetics) -"bKR" = ( -/obj/effect/floor_decal/corner/mauve/full, -/turf/simulated/floor/tiled/white, -/area/medical/genetics) +/area/rnd/telesci) "bKS" = ( /obj/effect/floor_decal/corner/mauve{ icon_state = "corner_white"; @@ -51681,21 +51671,17 @@ /turf/simulated/floor/tiled/white, /area/medical/genetics) "bKU" = ( -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 +/obj/effect/floor_decal/corner/mauve{ + icon_state = "corner_white"; + dir = 6 }, -/obj/machinery/door/window/westleft{ - req_access = list(9) - }, -/obj/effect/decal/warning_stripes, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/light{ dir = 4; - status = 0 + status = 2 }, -/mob/living/carbon/human/monkey, -/turf/simulated/floor/plating, -/area/medical/genetics) +/turf/simulated/floor/tiled/white, +/area/rnd/telesci) "bKV" = ( /obj/machinery/optable, /turf/simulated/floor/tiled/white, @@ -51923,20 +51909,8 @@ /turf/simulated/floor/plating, /area/maintenance/research_port) "bLr" = ( -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/machinery/door/window/northright{ - req_one_access = list(9) - }, -/obj/effect/decal/warning_stripes, -/mob/living/carbon/human/stok, -/turf/simulated/floor/plating, -/area/medical/genetics) +/turf/simulated/floor/tiled/dark, +/area/rnd/telesci) "bLs" = ( /obj/effect/floor_decal/corner/mauve{ icon_state = "corner_white"; @@ -51945,20 +51919,12 @@ /turf/simulated/floor/tiled/white, /area/medical/genetics) "bLt" = ( -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 8 +/obj/effect/floor_decal/corner/mauve{ + icon_state = "corner_white"; + dir = 10 }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/machinery/door/window/northleft{ - req_access = list(9) - }, -/obj/effect/decal/warning_stripes, -/mob/living/carbon/human/monkey, -/turf/simulated/floor/plating, -/area/medical/genetics) +/turf/simulated/floor/tiled/white, +/area/rnd/telesci) "bLu" = ( /obj/effect/floor_decal/corner/mauve/full, /obj/machinery/alarm{ @@ -52451,9 +52417,13 @@ /turf/simulated/floor/plating, /area/maintenance/research_port) "bMu" = ( -/obj/effect/decal/cleanable/liquid_fuel, -/turf/simulated/floor/plating, -/area/maintenance/research_port) +/obj/machinery/alarm{ + dir = 4; + icon_state = "alarm0"; + pixel_x = -22 + }, +/turf/simulated/floor/tiled/dark, +/area/rnd/telesci) "bMv" = ( /obj/effect/decal/cleanable/liquid_fuel, /obj/structure/reagent_dispensers/fueltank, @@ -52469,13 +52439,14 @@ /turf/simulated/floor/tiled/white, /area/medical/genetics) "bMx" = ( +/obj/machinery/light/small, /obj/effect/floor_decal/corner/mauve, /obj/effect/floor_decal/corner/mauve{ icon_state = "corner_white"; dir = 1 }, /turf/simulated/floor/tiled/white, -/area/medical/genetics) +/area/rnd/telesci) "bMy" = ( /obj/machinery/atmospherics/unary/vent_pump/siphon{ dir = 1 @@ -61681,7 +61652,7 @@ pixel_y = -22 }, /turf/simulated/floor/tiled/white, -/area/medical/genetics) +/area/rnd/telesci) "cdW" = ( /obj/effect/floor_decal/corner/mauve, /obj/effect/floor_decal/corner/mauve{ @@ -62742,6 +62713,158 @@ }, /turf/simulated/floor/plating, /area/outpost/mining_main/eva) +"cfT" = ( +/obj/structure/table/standard, +/obj/machinery/newscaster{ + pixel_y = 32 + }, +/obj/machinery/light_switch{ + pixel_x = -23; + pixel_y = 0 + }, +/obj/effect/floor_decal/corner/mauve/full{ + icon_state = "corner_white_full"; + dir = 8 + }, +/obj/item/clothing/mask/gas, +/turf/simulated/floor/tiled/white, +/area/rnd/telesci) +"cfU" = ( +/obj/structure/table/standard, +/obj/item/weapon/paper_bin, +/obj/item/weapon/pen, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, +/obj/machinery/requests_console{ + department = "Telescience Lab"; + departmentType = 2; + name = "Requests Console"; + pixel_x = -32; + pixel_y = 0 + }, +/obj/effect/floor_decal/corner/mauve{ + icon_state = "corner_white"; + dir = 9 + }, +/turf/simulated/floor/tiled/white, +/area/rnd/telesci) +"cfV" = ( +/obj/structure/table/reinforced, +/obj/machinery/button/remote/blast_door{ + id = "telescience"; + name = "Containment Blast Doors"; + pixel_x = 0; + pixel_y = 4; + req_access = list(55) + }, +/obj/effect/floor_decal/corner/mauve/diagonal, +/obj/effect/floor_decal/corner/mauve/diagonal{ + icon_state = "corner_white_diagonal"; + dir = 8 + }, +/obj/item/device/radio/intercom{ + dir = 0; + name = "Station Intercom (General)"; + pixel_x = -27 + }, +/turf/simulated/floor/tiled/white, +/area/rnd/telesci) +"cfW" = ( +/obj/machinery/light{ + dir = 8; + icon_state = "tube1"; + pixel_y = 0 + }, +/turf/simulated/floor/tiled/white, +/area/rnd/telesci) +"cfX" = ( +/obj/structure/grille, +/obj/structure/window/phoronreinforced, +/obj/structure/window/phoronreinforced{ + icon_state = "phoronrwindow"; + dir = 1 + }, +/obj/structure/window/phoronreinforced{ + icon_state = "phoronrwindow"; + dir = 4 + }, +/obj/structure/window/phoronreinforced{ + icon_state = "phoronrwindow"; + dir = 8 + }, +/obj/machinery/door/blast/regular{ + density = 0; + icon_state = "pdoor0"; + id = "telescience"; + name = "Containment Blast Doors"; + opacity = 0 + }, +/obj/machinery/door/firedoor, +/obj/machinery/door/blast/regular{ + density = 0; + icon_state = "pdoor0"; + id = "Biohazard"; + name = "Biohazard Shutter"; + opacity = 0 + }, +/turf/simulated/floor/plating, +/area/rnd/telesci) +"cfY" = ( +/obj/machinery/camera/network/research{ + c_tag = "Research - Telescience Test Chamber"; + dir = 4; + network = list("Research") + }, +/turf/simulated/floor/tiled/dark, +/area/rnd/telesci) +"cfZ" = ( +/turf/simulated/floor/tiled/dark, +/area/rnd/telesci) +"cga" = ( +/obj/effect/floor_decal/corner/mauve/full{ + icon_state = "corner_white_full"; + dir = 4 + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, +/turf/simulated/floor/tiled/white, +/area/rnd/telesci) +"cgb" = ( +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, +/area/rnd/telesci) +"cgc" = ( +/obj/machinery/telepad, +/turf/simulated/floor/tiled/dark, +/area/rnd/telesci) +"cgd" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/research{ + name = "Miscellaneous Research Room"; + req_one_access = list(7,29) + }, +/turf/simulated/floor/tiled/white, +/area/rnd/telesci) +"cge" = ( +/obj/effect/floor_decal/corner/mauve, +/obj/effect/floor_decal/corner/mauve{ + icon_state = "corner_white"; + dir = 1 + }, +/turf/simulated/floor/tiled/white, +/area/rnd/telesci) +"cgf" = ( +/obj/effect/floor_decal/corner/mauve, +/obj/effect/floor_decal/corner/mauve{ + icon_state = "corner_white"; + dir = 1 + }, +/turf/simulated/floor/tiled/white, +/area/rnd/telesci) (1,1,1) = {" aaa @@ -83723,8 +83846,8 @@ bGp bGp aLf aLf -aMP -bMu +aLf +aLf bep baD baD @@ -83972,16 +84095,16 @@ bCh bEN bFT bGq -bGq -bGq -bGq -bGq -bGq -bGq -bGq -bGq +cfT +cfU +cfV +cfW +bIM +cfX +cfY +cgb bMu -bMW +aLf bep baD bOz @@ -84232,13 +84355,13 @@ bGq bHd bHU bIJ -bJF -bKk +bIM +bIM bKQ -bGq -bGq -bMv -bMu +cfZ +cgc +bLr +aLf bNt bNT bOA @@ -84489,13 +84612,13 @@ bGr bHe bHV bIK -bJG -bKl +bIM +bIM bKR bLr -bGq -baD -baD +bLr +bLr +aLf bep aLi aMP @@ -84748,11 +84871,11 @@ bHW bIL bJH bKm -bKS -bLs -bLW -bMw -baD +bGq +bGq +bGq +bGq +aLf bep aLi aLi @@ -85001,13 +85124,13 @@ bqZ bCr bGt bHg -bHX +bHV +bIM bIM -bJI bKn -bKT +bIM bLt -bGq +cgd bMx baD bep @@ -85263,9 +85386,9 @@ bIN bJJ bKo bKU +cga bGq -bGq -bMx +cge baD bNu baD @@ -85521,8 +85644,8 @@ bFV bFV bFV bFV -bFV -bMx +bGq +cgf cdW bep bNU @@ -86036,7 +86159,7 @@ bHq bHq bHq bLX -bMw +bMx baD aLf bLp From 987d92034e523e808c09d03eead8debb4c06cc71 Mon Sep 17 00:00:00 2001 From: skull132 Date: Thu, 3 Aug 2017 23:29:29 +0300 Subject: [PATCH 2/6] Changelogs, 03AUG2017 --- html/changelog.html | 6 ++++++ html/changelogs/.all_changelog.yml | 3 +++ html/changelogs/skull132-bybebye_genetics.yml | 5 ----- 3 files changed, 9 insertions(+), 5 deletions(-) delete mode 100644 html/changelogs/skull132-bybebye_genetics.yml diff --git a/html/changelog.html b/html/changelog.html index b372b21e57b..44401144a4d 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -56,6 +56,12 @@ -->
+

03 August 2017

+

Skull132 updated:

+
    +
  • Genetics has been removed again.
    • +
+

02 August 2017

Lohikar updated:

    diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index 5b9c2711b98..0acd976365b 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -4509,3 +4509,6 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. - bugfix: Tesla coils now actually work without requiring server staff intervention. - bugfix: Fixed a bug where orbits (such as the Tesla) didn't animate as they were intended to. +2017-08-03: + Skull132: + - rscdel: Genetics has been removed again. diff --git a/html/changelogs/skull132-bybebye_genetics.yml b/html/changelogs/skull132-bybebye_genetics.yml deleted file mode 100644 index c32eb52f1d2..00000000000 --- a/html/changelogs/skull132-bybebye_genetics.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: Skull132 -delete-after: true - -changes: - - rscdel: "Genetics has been removed again." From de046a95b7fb0ed2f4a3ab7930bb3f224b47fcbe Mon Sep 17 00:00:00 2001 From: Alberyk Date: Fri, 4 Aug 2017 15:24:04 -0300 Subject: [PATCH 3/6] Custom items 03/08 (#3220) Adds the following items: Ceramic Teapot - Sean Brianne - zelmana Workers Flask - Nasser Antonov - sonicgotnuked Tan Engineering Beret - M.A.K.E - toasterstrudes Antenna - M.A.K.E - toasterstrudes Vaporizer Pen - Nathan Corvo - jkjudgex Also, some changes code and path changes on certain items. --- code/modules/customitems/item_defines.dm | 234 +++++++++++++-------- icons/obj/custom_items/brianne_teapot.dmi | Bin 0 -> 462 bytes icons/obj/custom_items/corvo_cigarette.dmi | Bin 0 -> 862 bytes icons/obj/custom_items/dompesh_cloth.dmi | Bin 1293 -> 0 bytes icons/obj/custom_items/make_items.dmi | Bin 0 -> 1418 bytes icons/obj/custom_items/maksim_coat.dmi | Bin 736 -> 0 bytes icons/obj/custom_items/nasser_flask.dmi | Bin 0 -> 438 bytes 7 files changed, 145 insertions(+), 89 deletions(-) create mode 100644 icons/obj/custom_items/brianne_teapot.dmi create mode 100644 icons/obj/custom_items/corvo_cigarette.dmi delete mode 100644 icons/obj/custom_items/dompesh_cloth.dmi create mode 100644 icons/obj/custom_items/make_items.dmi delete mode 100644 icons/obj/custom_items/maksim_coat.dmi create mode 100644 icons/obj/custom_items/nasser_flask.dmi diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm index a8ed7fcb274..e7524416c84 100644 --- a/code/modules/customitems/item_defines.dm +++ b/code/modules/customitems/item_defines.dm @@ -36,7 +36,7 @@ All custom items with worn sprites must follow the contained sprite system: http icon = 'icons/obj/custom_items/motaki_bandana.dmi' icon_state = "motaki_bandana" item_state = "motaki_bandana" - contained_sprite = 1 + contained_sprite = TRUE /obj/item/clothing/suit/armor/vest/fluff/zubari_jacket //Fancy Jacket - Zubari Akenzua - filthyfrankster @@ -45,7 +45,7 @@ All custom items with worn sprites must follow the contained sprite system: http icon = 'icons/obj/custom_items/zubari_jacket.dmi' icon_state = "zubari_jacket" item_state = "zubari_jacket" - contained_sprite = 1 + contained_sprite = TRUE /obj/item/clothing/suit/unathi/mantle/fluff/yinzr_mantle //Heirloom Unathi Mantle - Sslazhir Yinzr - alberyk @@ -55,7 +55,7 @@ All custom items with worn sprites must follow the contained sprite system: http icon_state = "yinzr_mantle" //special thanks to Araskael item_state = "yinzr_mantle" species_restricted = list("Unathi") //forged for lizardmen - contained_sprite = 1 + contained_sprite = TRUE /obj/item/clothing/glasses/fluff/nebula_glasses //chich eyewear - Roxy Wallace - nebulaflare @@ -64,7 +64,7 @@ All custom items with worn sprites must follow the contained sprite system: http icon = 'icons/obj/custom_items/nebula_glasses.dmi' icon_state = "nebula_glasses" item_state = "nebula_glasses" - contained_sprite = 1 + contained_sprite = TRUE var/obj/item/weapon/disk/chip /obj/item/clothing/glasses/fluff/nebula_glasses/New() @@ -114,11 +114,7 @@ All custom items with worn sprites must follow the contained sprite system: http /obj/item/clothing/ears/skrell/fluff/dompesh_cloth //Skrell Purple Head Cloth - Shkor-Dyet Dom'Pesh - mofo1995 name = "male skrell purple head cloth" - desc = "A purple cloth band worn by male skrell around their head tails." - icon = 'icons/obj/custom_items/dompesh_cloth.dmi' - icon_state = "dompesh_cloth" - item_state = "dompesh_cloth" - contained_sprite = 1 + desc = "A set of purple headcloths fit for a skrell's head tails. This one has a small SAMPLe logo on the interior of each cloth, perfect for scientific skrell." /obj/item/weapon/fluff/kiara_altar //Pocket Altar - Kiara Branwen - nursiekitty @@ -145,7 +141,7 @@ All custom items with worn sprites must follow the contained sprite system: http icon = 'icons/obj/custom_items/bell_coat.dmi' icon_state = "bell_hat" item_state = "bell_hat" - contained_sprite = 1 + contained_sprite = TRUE /obj/item/clothing/suit/storage/det_trench/fluff/bell_coat //Pinned Brown Coat - Avery Bell - serveris6 name = "pinned brown coat" @@ -153,7 +149,7 @@ All custom items with worn sprites must follow the contained sprite system: http icon = 'icons/obj/custom_items/bell_coat.dmi' icon_state = "bell_coat" item_state = "bell_coat" - contained_sprite = 1 + contained_sprite = TRUE allowed = list(/obj/item/weapon/tank/emergency_oxygen, /obj/item/device/flashlight,/obj/item/weapon/gun/energy,/obj/item/weapon/gun/projectile,/obj/item/ammo_magazine,/obj/item/ammo_casing, /obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs,/obj/item/weapon/storage/fancy/cigarettes,/obj/item/weapon/flame/lighter,/obj/item/device/taperecorder, /obj/item/clothing/accessory/badge/fluff/bell_badge) @@ -171,7 +167,6 @@ All custom items with worn sprites must follow the contained sprite system: http item_state = "knife" slot_flags = SLOT_BELT w_class = 1 - force = 2 /obj/item/device/kit/paint/ripley/fluff/zairjah_kit //Hephaestus Industrial Exosuit MK III Customization Kit - Zairjah - alberyk @@ -189,7 +184,7 @@ All custom items with worn sprites must follow the contained sprite system: http icon = 'icons/obj/custom_items/usiki_cane.dmi' icon_state = "usiki_cane" item_state = "usiki_cane" - contained_sprite = 1 + contained_sprite = TRUE /obj/item/weapon/cane/fluff/usiki_cane/attack_self(mob/user as mob) if(all_languages[LANGUAGE_UNATHI] in user.languages) @@ -204,7 +199,7 @@ All custom items with worn sprites must follow the contained sprite system: http icon = 'icons/obj/custom_items/kathleen_glove.dmi' icon_state = "kathleen_glove" item_state = "kathleen_glove" - contained_sprite = 1 + contained_sprite = TRUE gender = NEUTER body_parts_covered = null @@ -241,7 +236,7 @@ All custom items with worn sprites must follow the contained sprite system: http body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS flags_inv = HIDEJUMPSUIT|HIDETAIL species_restricted = list("Unathi") - contained_sprite = 1 + contained_sprite = TRUE /obj/item/clothing/mask/gas/fluff/karnaikai_mask //Unathi head wrappings - Azeazekal Karnaikai - canon35 @@ -251,7 +246,7 @@ All custom items with worn sprites must follow the contained sprite system: http icon_state = "karnaikai_mask" //special thanks to Araskael item_state = "karnaikai_mask" species_restricted = list("Unathi") - contained_sprite = 1 + contained_sprite = TRUE /obj/item/weapon/contraband/poster/fluff/conservan_poster //ATLAS poster - Conservan Xullie - conservatron @@ -318,7 +313,7 @@ All custom items with worn sprites must follow the contained sprite system: http icon = 'icons/obj/custom_items/nioathi_hoodie.dmi' icon_state = "nioathi_hoodie" item_state = "nioathi_hoodie" - contained_sprite = 1 + contained_sprite = TRUE /obj/item/weapon/implanter/fluff //snowflake implanters for snowflakes @@ -349,8 +344,8 @@ All custom items with worn sprites must follow the contained sprite system: http slot_flags = SLOT_BELT force = 2 w_class = 2 - contained_sprite = 1 - var/active = 0 + contained_sprite = TRUE + var/active = FALSE /obj/item/weapon/fluff/moon_baton/attack_self(mob/user) active= !active @@ -368,7 +363,9 @@ All custom items with worn sprites must follow the contained sprite system: http item_state = icon_state slot_flags = initial(slot_flags) attack_verb = list("prodded") - user.regenerate_icons() + + user.update_inv_l_hand(FALSE) + user.update_inv_r_hand() /obj/item/clothing/suit/armor/vest/fabian_coat //NT APF Armor - Fabian Goellstein - mirkoloio @@ -377,7 +374,7 @@ All custom items with worn sprites must follow the contained sprite system: http icon = 'icons/obj/custom_items/fabian_coat.dmi' icon_state = "fabian_coat_open" item_state = "fabian_coat_open" - contained_sprite = 1 + contained_sprite = TRUE /obj/item/clothing/suit/armor/vest/fabian_coat/verb/toggle() set name = "Toggle Coat Zipper" @@ -413,7 +410,7 @@ All custom items with worn sprites must follow the contained sprite system: http icon = 'icons/obj/custom_items/vittorio_fez.dmi' icon_state = "vittorio_fez" item_state = "vittorio_fez" - contained_sprite = 1 + contained_sprite = TRUE /obj/item/clothing/suit/fluff/centurion_cloak //Paludamentum - Centurion - cakeisossim @@ -423,7 +420,7 @@ All custom items with worn sprites must follow the contained sprite system: http icon_state = "centurion_cloak" item_state = "centurion_cloak" body_parts_covered = UPPER_TORSO|LOWER_TORSO - contained_sprite = 1 + contained_sprite = TRUE /obj/item/clothing/ears/bandanna/fluff/kir_bandanna //Kir's Bandanna - Kir Iziki - araskael @@ -432,7 +429,7 @@ All custom items with worn sprites must follow the contained sprite system: http icon = 'icons/obj/custom_items/kir_bandanna.dmi' icon_state = "kir_bandanna" item_state = "kir_bandanna" - contained_sprite = 1 + contained_sprite = TRUE /obj/item/clothing/suit/storage/toggle/bomber/fluff/ash_jacket //Hand-me-down Bomber Jacket - Ash LaCroix - superballs @@ -444,7 +441,7 @@ All custom items with worn sprites must follow the contained sprite system: http item_state = "ash_jacket" icon_open = "ash_jacket_open" icon_closed = "ash_jacket" - contained_sprite = 1 + contained_sprite = TRUE /obj/item/clothing/accessory/badge/fluff/dylan_tags //Dog Tags - Dylan Sutton - sircatnip @@ -455,7 +452,7 @@ All custom items with worn sprites must follow the contained sprite system: http item_state = "dylan_tags" stored_name = "Wright, Dylan L" badge_string = "Pacific Union Special Forces" - contained_sprite = 1 + contained_sprite = TRUE slot_flags = SLOT_MASK | SLOT_TIE @@ -465,10 +462,11 @@ All custom items with worn sprites must follow the contained sprite system: http icon = 'icons/obj/custom_items/rico_stripes.dmi' icon_state = "rico_stripes" item_state = "rico_stripes" - contained_sprite = 1 - canremove = 0 - abstract = 1 + contained_sprite = TRUE + canremove = FALSE + abstract = TRUE species_restricted = list("Machine") + autodrobe_no_remove = TRUE /obj/item/weapon/reagent_containers/food/drinks/flask/fluff/barcia_flask //First Shot - Gabriel Barcia - mrgabol100 @@ -484,8 +482,8 @@ All custom items with worn sprites must follow the contained sprite system: http icon = 'icons/obj/custom_items/stone_ring.dmi' icon_state = "stone_ring" item_state = "stone_ring" - contained_sprite = 1 - clipped = 1 + contained_sprite = TRUE + clipped = TRUE species_restricted = null gender = NEUTER body_parts_covered = null @@ -497,7 +495,7 @@ All custom items with worn sprites must follow the contained sprite system: http icon = 'icons/obj/custom_items/sayyidah_dress.dmi' //special thanks to Coalf for the sprites icon_state = "sayyidah_dress" item_state = "sayyidah_dress" - contained_sprite = 1 + contained_sprite = TRUE /obj/item/clothing/suit/storage/fluff/vittorio_jacket //Atlas Overcoat - Vittorio Giurifiglio - tytostyris @@ -506,7 +504,7 @@ All custom items with worn sprites must follow the contained sprite system: http icon = 'icons/obj/custom_items/vittorio_jacket.dmi' icon_state = "vittorio_jacket" item_state = "vittorio_jacket" - contained_sprite = 1 + contained_sprite = TRUE /obj/item/clothing/suit/storage/toggle/labcoat/fluff/helmut_labcoat //CERN Labcoat - Helmut Kronigernischultz - pyrociraptor @@ -517,7 +515,7 @@ All custom items with worn sprites must follow the contained sprite system: http item_state = "helmut_labcoat" icon_open = "helmut_labcoat_open" icon_closed = "helmut_labcoat" - contained_sprite = 1 + contained_sprite = TRUE /obj/item/clothing/shoes/jackboots/unathi/fluff/yinzr_sandals //Marching Sandals - Sslazhir Yinzr - alberyk @@ -526,7 +524,7 @@ All custom items with worn sprites must follow the contained sprite system: http icon = 'icons/obj/custom_items/yinzr_sandals.dmi' item_state = "yinzr_sandals" icon_state = "yinzr_sandals" - contained_sprite = 1 + contained_sprite = TRUE /obj/item/clothing/accessory/fluff/laikov_broach //Jeweled Broach - Aji'Rah Laikov - nebulaflare @@ -535,7 +533,7 @@ All custom items with worn sprites must follow the contained sprite system: http icon = 'icons/obj/custom_items/laikov_broach.dmi' item_state = "laikov_broach" icon_state = "laikov_broach" - contained_sprite = 1 + contained_sprite = TRUE /obj/item/clothing/accessory/fluff/laikov_broach/attack_self(mob/user as mob) if(isliving(user)) @@ -593,7 +591,7 @@ All custom items with worn sprites must follow the contained sprite system: http icon_state = "caleb_badge" stored_name = "Caleb Greene" badge_string = "NOS Apollo Head of Security" - contained_sprite = 1 + contained_sprite = TRUE /obj/item/fluff/messa_pressing //Pressing of Messa's Tears - Poslan Kur'yer-Isra - jboy2000000 @@ -616,7 +614,7 @@ All custom items with worn sprites must follow the contained sprite system: http icon = 'icons/obj/custom_items/cat_religion.dmi' icon_state = "poslan_jacket" item_state = "poslan_jacket" - contained_sprite = 1 + contained_sprite = TRUE /obj/item/sign/fluff/alexis_degree //Xenonuerology Doctorate - Alexis Shaw - tenenza @@ -633,18 +631,19 @@ All custom items with worn sprites must follow the contained sprite system: http icon = 'icons/obj/custom_items/rur_collar.dmi' icon_state = "rur_collar" item_state = "rur_collar" - contained_sprite = 1 + contained_sprite = TRUE body_parts_covered = 0 - canremove = 0 + canremove = FALSE species_restricted = list("Machine") - var/emagged = 0 + autodrobe_no_remove = TRUE + var/emagged = FALSE /obj/item/clothing/mask/fluff/rur_collar/emag_act(var/remaining_charges, var/mob/user) if (!emagged) user << "You short out \the [src]'s locking mechanism." src.icon_state = "rur_collar_broken" - src.canremove = 1 - src.emagged = 1 + src.canremove = TRUE + src.emagged = TRUE playsound(src.loc, 'sound/effects/sparks1.ogg', 100, 0) return 1 @@ -655,7 +654,7 @@ All custom items with worn sprites must follow the contained sprite system: http icon = 'icons/obj/custom_items/simon_scarf.dmi' icon_state = "simon_scarf" item_state = "simon_scarf" - contained_sprite = 1 + contained_sprite = TRUE /obj/item/clothing/head/soft/sec/corp/fluff/karson_cap //Karson's Cap - Eric Karson - dronzthewolf @@ -693,27 +692,16 @@ All custom items with worn sprites must follow the contained sprite system: http icon = 'icons/obj/custom_items/zohjar_clothing.dmi' icon_state = "zohjar_uniform" item_state = "zohjar_uniform" - contained_sprite = 1 + contained_sprite = TRUE -/obj/item/clothing/suit/storage/toggle/labcoat/fluff/zohjar_jacket //People's Republic Medical Officer Coat - Zohjar Rasateir - lordraven001 +/obj/item/clothing/suit/storage/toggle/labcoat/tajaran/fluff/zohjar_jacket //People's Republic Medical Officer Coat - Zohjar Rasateir - lordraven001 name = "people's republic medical officer coat" desc = "A sterile insulated coat made of leather stitched over fur. It has two gold lapels indicating Officer rank. \ The a white armband with a scarlet line in the center indicates that the person wearing this coat is medically trained." - icon = 'icons/obj/custom_items/zohjar_clothing.dmi' - icon_state = "zohjar_jacket" - item_state = "zohjar_jacket" - icon_open = "zohjar_jacket_open" - icon_closed = "zohjar_jacket" - contained_sprite = 1 - -/obj/item/clothing/suit/storage/fluff/maksim_coat //Tajaran Naval Officer's Coat - Maksim Vasilyev - aimlessanalyst +/obj/item/clothing/suit/storage/tajaran/fluff/maksim_coat //Tajaran Naval Officer's Coat - Maksim Vasilyev - aimlessanalyst name = "tajaran naval officer coat" desc = "A thick wool coat from Adhomai, calling back to days long past." - icon = 'icons/obj/custom_items/maksim_coat.dmi' - icon_state = "maksim_coat" - item_state = "maksim_coat" - contained_sprite = 1 /obj/item/sign/fluff/iskanz_atimono //Framed Zatimono - Iskanz Sal'Dans - zundy @@ -730,7 +718,7 @@ All custom items with worn sprites must follow the contained sprite system: http icon = 'icons/obj/custom_items/zahra_pin.dmi' icon_state = "zahra_pin" item_state = "zahra_pin" - contained_sprite = 1 + contained_sprite = TRUE /obj/item/clothing/accessory/armband/fluff/karl_armband //Medizinercorps Armband - Karl Jonson - arrow768 @@ -739,7 +727,7 @@ All custom items with worn sprites must follow the contained sprite system: http icon = 'icons/obj/custom_items/karl_armband.dmi' icon_state = "karl_armband" item_state = "karl_armband" - contained_sprite = 1 + contained_sprite = TRUE /obj/item/weapon/melee/fluff/rook_whip //Ceremonial Whip - Rook Jameson - hivefleetchicken @@ -749,7 +737,7 @@ All custom items with worn sprites must follow the contained sprite system: http icon_state = "rook_whip" item_state = "rook_whip" slot_flags = SLOT_BELT - contained_sprite = 1 + contained_sprite = TRUE w_class = 3 force = 2 attack_verb = list("flogged", "whipped", "lashed", "disciplined") @@ -763,7 +751,7 @@ All custom items with worn sprites must follow the contained sprite system: http item_state = "lilith_coat" icon_open = "lilith_coat_open" icon_closed = "lilith_coat" - contained_sprite = 1 + contained_sprite = TRUE /obj/item/clothing/head/fluff/sayyidah_tiara //Jeweled Tiara - Sayyidah Al-Kateb - alberyk @@ -772,7 +760,7 @@ All custom items with worn sprites must follow the contained sprite system: http icon = 'icons/obj/custom_items/sayyidah_dress.dmi' //special thanks to TheGreatJorge for the sprites icon_state = "sayyidah_tiara" item_state = "sayyidah_tiara" - contained_sprite = 1 + contained_sprite = TRUE /obj/item/clothing/accessory/fluff/jeyne_pendant //Jeyne's Pendant - Jeyne Kahale - themuncorn @@ -782,7 +770,7 @@ All custom items with worn sprites must follow the contained sprite system: http icon_state = "jeyne_pendant" item_state = "jeyne_pendant" slot_flags = SLOT_MASK | SLOT_TIE - contained_sprite = 1 + contained_sprite = TRUE /obj/item/clothing/suit/storage/hooded/wintercoat/fluff/basil_coat //Consortium Magister's Robes - Basil Drabardi - aimlessanalyst @@ -792,7 +780,7 @@ All custom items with worn sprites must follow the contained sprite system: http icon_state = "basil_coat" item_state = "basil_coat" body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS - contained_sprite = 1 + contained_sprite = TRUE hoodtype = /obj/item/clothing/head/winterhood/fluff/basil_hood /obj/item/clothing/head/winterhood/fluff/basil_hood @@ -808,7 +796,7 @@ All custom items with worn sprites must follow the contained sprite system: http icon = 'icons/obj/custom_items/iskra_clothing.dmi' icon_state = "iskra_clothing" item_state = "iskra_clothing" - contained_sprite = 1 + contained_sprite = TRUE /obj/item/clothing/suit/storage/fluff/tsali_coat //Mariziite Shroud - Cruz Tsali - serveris6 @@ -818,7 +806,7 @@ All custom items with worn sprites must follow the contained sprite system: http icon = 'icons/obj/custom_items/tsali_coat.dmi' icon_state = "tsali_coat" item_state = "tsali_coat" - contained_sprite = 1 + contained_sprite = TRUE /obj/item/clothing/under/fluff/ana_uniform //Retired Uniform - Ana Roh'hi'tin - suethecake @@ -827,7 +815,7 @@ All custom items with worn sprites must follow the contained sprite system: http icon = 'icons/obj/custom_items/ana_clothing.dmi' icon_state = "ana_uniform" item_state = "ana_uniform" - contained_sprite = 1 + contained_sprite = TRUE /obj/item/clothing/suit/storage/forensics/fluff/ana_jacket //CSI Jacket - Ana Roh'hi'tin - suethecake name = "CSI jacket" @@ -835,7 +823,7 @@ All custom items with worn sprites must follow the contained sprite system: http icon = 'icons/obj/custom_items/ana_clothing.dmi' icon_state = "ana_jacket" item_state = "ana_jacket" - contained_sprite = 1 + contained_sprite = TRUE /obj/item/clothing/accessory/badge/old/fluff/ana_badge //Faded Badge - Ana Roh'hi'tin - suethecake name = "faded badge" @@ -858,7 +846,7 @@ All custom items with worn sprites must follow the contained sprite system: http icon = 'icons/obj/custom_items/ikrad_beret.dmi' icon_state = "ikrad_beret" item_state = "ikrad_beret" - contained_sprite = 1 + contained_sprite = TRUE var/letter /obj/item/clothing/head/beret/engineering/fluff/ikrad_beret/New() @@ -903,7 +891,7 @@ All custom items with worn sprites must follow the contained sprite system: http icon = 'icons/obj/custom_items/ryan_jacket.dmi' icon_state = "ryan_jacket" item_state = "ryan_jacket" - contained_sprite = 1 + contained_sprite = TRUE /obj/item/clothing/suit/storage/fluff/yuri_duster //Martian Duster - Yuri Daruski - bv1000 @@ -914,7 +902,7 @@ All custom items with worn sprites must follow the contained sprite system: http icon = 'icons/obj/custom_items/yuri_duster.dmi' icon_state = "yuri_duster" item_state = "yuri_duster" - contained_sprite = 1 + contained_sprite = TRUE /obj/item/clothing/accessory/badge/fluff/bell_badge //Detective's Credentials - Avery Bell - serveris6 @@ -923,7 +911,7 @@ All custom items with worn sprites must follow the contained sprite system: http icon = 'icons/obj/custom_items/bell_coat.dmi' icon_state = "bell_badge" item_state = "bell_badge" - contained_sprite = 1 + contained_sprite = TRUE stored_name = "Avery Bell" badge_string = "Silhouette Co. Consulting Detective" @@ -955,7 +943,7 @@ All custom items with worn sprites must follow the contained sprite system: http icon = 'icons/obj/custom_items/karlan_beret.dmi' icon_state = "karlan_beret" item_state = "karlan_beret" - contained_sprite = 1 + contained_sprite = TRUE /obj/item/clothing/under/fluff/guskov_uniform //Tajaran Service Uniform - Guskov Andrei - fireandglory @@ -964,7 +952,7 @@ All custom items with worn sprites must follow the contained sprite system: http icon = 'icons/obj/custom_items/guskov_uniform.dmi' icon_state = "guskov_uniform" item_state = "guskov_uniform" - contained_sprite = 1 + contained_sprite = TRUE /obj/item/weapon/fluff/zhilin_book //Siik'maas-Tau Ceti Basic Dictionary - Zhilin Vadim - fireandglory @@ -975,7 +963,7 @@ All custom items with worn sprites must follow the contained sprite system: http w_class = 3 /obj/item/weapon/fluff/zhilin_book/attack_self(mob/user as mob) - user.visible_message("[user] starts flipping through \the [src].", + user.visible_message("[user] starts flipping through \the [src].", "You start looking through \the [src], it appears to be filled with translations of Tau-Ceti basic for tajaran users.", "You hear pages being flipped.") playsound(src.loc, "pageturn", 50, 1) @@ -989,7 +977,7 @@ All custom items with worn sprites must follow the contained sprite system: http item_state = "fai_jacket" icon_open = "fai_jacket_open" icon_closed = "fai_jacket" - contained_sprite = 1 + contained_sprite = TRUE /obj/item/clothing/under/fluff/faysal_uniform //Old Tajaran Nobleman Suit - Faysal Al-Shennawi - alberyk @@ -998,7 +986,7 @@ All custom items with worn sprites must follow the contained sprite system: http icon = 'icons/obj/custom_items/faysal_uniform.dmi' icon_state = "faysal_uniform" item_state = "faysal_uniform" - contained_sprite = 1 + contained_sprite = TRUE /obj/item/clothing/glasses/welding/fluff/ghoz_eyes //Prosthetic Vaurca Eyelids - Ka'Akaix'Ghoz Zo'ra - sleepywolf @@ -1007,7 +995,7 @@ All custom items with worn sprites must follow the contained sprite system: http icon = 'icons/obj/custom_items/ghoz_eyes.dmi' icon_state = "ghoz_eyes" item_state = "ghoz_eyes" - contained_sprite = 1 + contained_sprite = TRUE action_button_name = "Toggle Eyelids" species_restricted = list("Vaurca") //i think this would make sense since those are some kind of vaurca build prothestic @@ -1018,7 +1006,7 @@ All custom items with worn sprites must follow the contained sprite system: http icon = 'icons/obj/custom_items/leo_coat.dmi' icon_state = "leo_hat" item_state = "leo_hat" - contained_sprite = 1 + contained_sprite = TRUE /obj/item/clothing/suit/storage/det_trench/fluff/leo_coat //Tagged brown coat - Leo Wyatt - keinto name = "tagged brown coat" @@ -1026,7 +1014,7 @@ All custom items with worn sprites must follow the contained sprite system: http icon = 'icons/obj/custom_items/leo_coat.dmi' icon_state = "leo_coat" item_state = "leo_coat" - contained_sprite = 1 + contained_sprite = TRUE /obj/item/weapon/nullrod/fluff/azaroz_staff //Null Staff - Kesaos Azaroz - paradoxspace @@ -1035,7 +1023,7 @@ All custom items with worn sprites must follow the contained sprite system: http icon = 'icons/obj/custom_items/azaroz_staff.dmi' icon_state = "azaroz_staff" item_state = "azaroz_staff" - contained_sprite = 1 + contained_sprite = TRUE slot_flags = SLOT_BACK w_class = 3 @@ -1048,15 +1036,15 @@ All custom items with worn sprites must follow the contained sprite system: http icon_state = "eul_robe" item_state = "eul_robe" body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS - contained_sprite = 1 - + contained_sprite = TRUE + /obj/item/clothing/glasses/regular/fluff/eul_glasses //Chained Wooden Spectacles - Uelak Eul - lordraven001 name = "chained wooden spectacles" desc = "A pair of wooden spectacles with a long bronze chain out the back of them. They have been bejeweled by benitoite and look elder from use." icon = 'icons/obj/custom_items/eul_clothing.dmi' icon_state = "eul_glasses" item_state = "eul_glasses" - contained_sprite = 1 + contained_sprite = TRUE /obj/item/clothing/suit/poncho/fluff/flaming_poncho //Stitched Heart White Poncho - Flaming Hearts Love Stars - sleepywolf @@ -1065,7 +1053,7 @@ All custom items with worn sprites must follow the contained sprite system: http icon = 'icons/obj/custom_items/flaming_poncho.dmi' icon_state = "flaming_poncho" item_state = "flaming_poncho" - contained_sprite = 1 + contained_sprite = TRUE /obj/item/clothing/accessory/badge/fluff/jane_badge //Tarnished Badge - Jane Pyre - somethingvile @@ -1075,7 +1063,7 @@ All custom items with worn sprites must follow the contained sprite system: http icon_state = "jane_badge" item_state = "jane_badge" slot_flags = SLOT_BELT | SLOT_TIE - contained_sprite = 1 + contained_sprite = TRUE stored_name = "Francis Pyre" badge_string = "CPD" @@ -1093,7 +1081,7 @@ All custom items with worn sprites must follow the contained sprite system: http icon = 'icons/obj/custom_items/vizili_clothing.dmi' icon_state = "vizili_mantle" item_state = "vizili_mantle" - contained_sprite = 1 + contained_sprite = TRUE /obj/item/clothing/mask/fluff/vizili_mask //Iron Mask - Urzkrauzi Vizili - jackboot name = "iron mask" @@ -1101,7 +1089,75 @@ All custom items with worn sprites must follow the contained sprite system: http icon = 'icons/obj/custom_items/vizili_clothing.dmi' icon_state = "vizili_mask" item_state = "vizili_mask" - contained_sprite = 1 + contained_sprite = TRUE flags_inv = HIDEEARS|HIDEFACE body_parts_covered = FACE w_class = 3.0 + + +/obj/item/weapon/reagent_containers/food/drinks/teapot/fluff/brianne_teapot //Ceramic Teapot - Sean Brianne - zelmana + name = "ceramic teapot" + desc = "A blue ceramic teapot, gilded with the abbreviation for NanoTrasen." + icon = 'icons/obj/custom_items/brianne_teapot.dmi' + icon_state = "brianne_teapot" + + +/obj/item/weapon/reagent_containers/food/drinks/flask/fluff/nasser_flask //Workers Flask - Nasser Antonov - sonicgotnuked + name = "workers flask" + desc = "A steel fold down flask that is dented and scratched. It looks like some parts are welded together, making it so it can not fold down anymore. It smells strongly of vodka.." + icon = 'icons/obj/custom_items/nasser_flask.dmi' + icon_state = "nasser_flask" + volume = 55 + + +/obj/item/clothing/head/beret/engineering/fluff/make_beret //Tan Engineering Beret - M.A.K.E - toasterstrudes + name = "tan engineering beret" + desc = "An engineering beret that appears to have been dyed tan, with an orange patch sewn into the middle of it." + icon = 'icons/obj/custom_items/make_items.dmi' + icon_state = "make_beret" + item_state = "make_beret" + contained_sprite = TRUE + +/obj/item/device/radio/headset/fluff/make_antenna //Antenna - M.A.K.E - toasterstrudes + name = "antenna" + desc = "An antenna attachment that can be screwed into the side of an IPC's head. It looks to have radio functions." + icon = 'icons/obj/custom_items/make_items.dmi' + icon_state = "make_antenna" + item_state = "make_antenna" + contained_sprite = TRUE + + +/obj/item/clothing/mask/fluff/corvo_cigarette //Vaporizer Pen - Nathan Corvo - jkjudgex + name = "vaporizer pen" + desc = "A simple vaporizer pen, the electronic version of the cigarette." + icon = 'icons/obj/custom_items/corvo_cigarette.dmi' + icon_state = "corvo_cigarette" + item_state = "corvo_cigarette" + body_parts_covered = 0 + w_class = 2 + slot_flags = SLOT_EARS | SLOT_MASK + contained_sprite = TRUE + var/active = FALSE + +/obj/item/clothing/mask/fluff/corvo_cigarette/attack_self(mob/user) + active= !active + if(active) + user << "You turn \the [src] on." + else + user << "You turn \the [src] off." + + update_icon() + user.update_inv_l_hand(FALSE) + user.update_inv_r_hand() + +/obj/item/clothing/mask/fluff/corvo_cigarette/update_icon() + if(active) + icon_state = "corvo_cigarette_on" + item_state = "corvo_cigarette_on" + else + icon_state = "corvo_cigarette" + item_state = "corvo_cigarette" + +/obj/item/clothing/mask/fluff/corvo_cigarette/examine(mob/user) + if(..(user, 1)) + user << "It is [active ? "on" : "off"]." \ No newline at end of file diff --git a/icons/obj/custom_items/brianne_teapot.dmi b/icons/obj/custom_items/brianne_teapot.dmi new file mode 100644 index 0000000000000000000000000000000000000000..1af142c095384a8e119d5b4fdd6c5d02003f9236 GIT binary patch literal 462 zcmV;<0WtoGP)0W2pK1aATJ+3i2t4LABUufQ2WY}hJ z=5TrOS76oX*BnJo!Ebo(MNYyzMYcgoykcwOKuNkSHl;mAxF|88IYP8IK(azhztr>L zkpKVy0d!JMQvg8b*k%9#0CIX%Sad{Xb7OL8aCB*JZU6vyoKseCa&`CgQ*iP1Sjdnc12TKN-M&fm1L7DeG^U0Ie?ZM^r+0ds!4 zlPc^(-2{M{tUcI~H#>q2S~r?tcKK081u#SbLG`3ij=8jx50Enf&`Ubk7_a^|-2f3` zPURZab=m!MW&7ya#evS48ULmmSk}ouheY2mCRTpu1y*MWPg`)U{{R3007*qoM6N<$ Ef?e{&F#rGn literal 0 HcmV?d00001 diff --git a/icons/obj/custom_items/corvo_cigarette.dmi b/icons/obj/custom_items/corvo_cigarette.dmi new file mode 100644 index 0000000000000000000000000000000000000000..49ad4bf858ad905774b6ec8046fe542eedffbc98 GIT binary patch literal 862 zcmeAS@N?(olHy`uVBq!ia0y~yU`zmE4rZXprv1TnK*}t@C&cx@fde5fE~ciYpDG#t z&t&+rm*L>SgBLDb`26|ve+GsVPO?|r82-NuzM{c!rGnwgQU-e+9iWzb|7;_GCNP!+ z`2{mLJiCzwgE*^8kr}K&J3F}V>VY(G=pn!v5>aoAuA1mjDkAPLPxt3DbB*O&dLh}^d4`V z-5Xt7lc(g=%~=@r>2txWLytLYjy+8YIByY?_V8km%Pz46iwj>KdYqBU8g4IMpvA+7)sa(1DeEpX_A=UHO)qew0 z|4Zk;tADrWO8VcheY3z)SMEKxuZqih|5@Hv|LQ*Wzw(avSbyrC_AV+mW}N1Rp$GD zpIUkE`s@4a!)4*}46klf*KNP{@9v$SPrH7%@0Kb>NGZgxeF;he4X=Wv_QgqP?VV`2 z`P_@k2ku_`yT4ZI*UMfRgxY`3o1dreubq8y^`$>=&RA)Fjo1HD`s=*z=f~SE5w1B9 zrgirHIo-{-{@uO#`S9;|@@#Mu8gl>6`(wEK)&67Y;@AKGY@1@lzpG%K`O?HhxDo~i z_Du!*-(}dpzps#ASN5>(;l;W~m;P~o*IxeRR2C@JLqX_MzHQ&UpQrzBbzE@mPu{!x v`wQwMVUi3C+e|jrn*$Aa|MxIZ(BQJX&o3eKua1{pKuSDa{an^LB{Ts5`SF18 literal 0 HcmV?d00001 diff --git a/icons/obj/custom_items/dompesh_cloth.dmi b/icons/obj/custom_items/dompesh_cloth.dmi deleted file mode 100644 index cf9589b4c9f5ad787a2799242d846e9a591acd94..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1293 zcmV+o1@iidP)V=-0C=2@jIj#BFcd}Sysx;lyIAe|7Dld`nRlsOMUN_O`Z%eMxFVc_+sVEpd znR}U6Q82ol;AeM#*uL!UTMUzh9UXlDCPzE&)S#kJ)Km#TFrp#+yMx+!E)@FI^;=nHs}T^C)&Pz>31(VZ8~0~GoQUS#KGpb$eE z2sm{}5w+vHERE)Jx^PF8FR>L%jz-S!vzj9x&pG=4XU=%=IR`{UM9#6ml38HM^tKv zw^wz)uYQ1CHYqWADzIDB$Wmw@chc8G?Ep7S3xwIrqu3h=_=Y zh=_=Yh=_=Yh=_=Yh=_=Y42P>+A7Njc zx_9^Sdwtl>R~F5ux!VAQCS=sT0lk_6P^jZhIKoY}HP+H)yH51In3c0BZg#YW_L^ zm28z;g*yPJ?gBqY|9Xw&9^*80rG=`XR_G7kN8`S*uR0bbXoPfkxi2(Sk z@f_gTxc;*7Cjg)2zu@cAw?ro7kG+-D1|NnX0g2>Y0N{4vE8ysk*bjCv#5k5qWI_N6 z&L|l>$BX*YR0ki1C;^>1lQCkCQFKeke*U8V6iDZr?@6ie;6;*T><2sT&xRrJA|fIp zA|fIpX?30V?;o_T{v~;x_wVo3+v3n|zq+dQGryZ;zkE2Fg59})|39pAa{vAx`L1t) z>D<46ja54L?_XneU`a^ULv&8jpJA3QYV5MvRlmBr1FrM_{k`gSeMHw+j`r^#u6~J# z$kkY0nM>W2&JWJ=%A6juA|fIpA|fIpA|fIpA{Y7>K#=x{4{EX200000NkvXXu0mjf DzU_U$ diff --git a/icons/obj/custom_items/make_items.dmi b/icons/obj/custom_items/make_items.dmi new file mode 100644 index 0000000000000000000000000000000000000000..a124f278f2a102c77fc15b3997028fe085f3d96d GIT binary patch literal 1418 zcma)6e>l^59RI9omNO+}!&-Dj5)x6%lu+y%)g&uBac)G|g@(%(M=OpijZS`ajHO8A zN6nel6>%8yqqybAc>Ji{Oy%pxY^UeB|E}kr{&>G%@8|W$`~AFMulMu5;zc@y(lF2f z0HE9tyBu3V)~7%sR`MT&Gk>nYwK($0D3_q~fj@*qMukL#1Hj1Tv{h<6wbo4@*#m9U zl3G&gzrUv2(kXCee>j`CJ9(_IV(7QT)T`kW!sc%!omeS&d5VADl1}Ojwm)?&!@+~q zBrw)xuIXFp1+M!2FnZnm< zmdVaMFWIULOp(R-jVJ1uQC%&M%UX!?=VFSP*#@NTvnKbM;r+rbn0+@5h`alO67UXH z(G$A_P!zx3NA%wJ-K!@MMFvsxIs^}Ur=os}6t~6$ZUnEFT%=OYE#+`NgkmtlfwO+z z`ueMIZ^NW55>t_m(>i)GPGM1pty%8q%V*nqcOwbJATnkk#LhdKeju#gqSh~KF{z{n zXIspFv?=u7$L*P!B{jYLy-Z=!-PEtHo%zO@u{44`kR8;$Qy3|#lUA|WijM*KnFV)Q zGQRvRRGoL?cu>uHmvWZ757-P}*Anx3M`4#9Ew}mU9WZ%!rIi8gkUtns!y~y-J3(Y% zf%^RWI-UE;7BFL?#iG-WDNMdJnb5v~NbVy4$odrtv_RQqed zYHR+)sHGAqFiac%bJlo`U=If^@us)H3)8R3oVOD$5_FNy{YXNeiwx_)JP zo2LCeT~=jUnM~*iD(MRZJ!%;sbr3v)YK#dM0_l2_g!jGp$T;ykCisjvj5+-swgZ~ks4A12c&bMZoj0_VVW0Xq441yTLQy?O2EW1h%IPC;KPbS$3{PR%Wti+6fw+;xn03% z`rX>#w9_zypHqr&TyJl0@6T1p(HIu{aN|&RadC0Q(()w!hSxqf!fLO$G(VUb_H$}~ z@*p<`xHgayx+Uh*5VizQl7g#oc?xc`caIDoRtTxzp2{?1aX6f(J1*By&J{N5bV_4P z7sihlt;h>f8j~vGQT!-{9UUD92L}}u6&e~E78Vv;IVK(+9`TRpLP0@SSXrK9 zLuqM1{{R300d!JMQvg8b*k%9#0C{>;Sad{Xb7OL8aCB*JZU6vyoKseCa&`CgQ*iP1 z=pp!iz@>th}b0n00GcR zL_t(oh3#02Zi6rkY*VMX20E?#|Bsz*=tHU0(&+L@hfJ>2bKIWV}{!&s-i9e;lP>2lBBdmB~$S�j|~uTx&l^w638XX zfu0pY15C`;^>Z>xpjyE9LG~6yWPs$_EWo?x68L^#CIAe9$Uu?%R6q`fKm|~hfY0hv zLTG?#2j~C;)-WqURf1|)5Eu}FVHkBIW0Xac3ljnkK062vFb0JPI5X)CCBWH;g$DS_ zaD@?{%bW($na5278Xtgh1bK0yIuD|w5E2Q#rql=$$*|y+o-wLBMz9nF4Y&Qr{;_l5C z$lC>?3buYlvNbDc^*sv&D5_w7y;v;}Rve0+S7k&%Lef>2OUb#--XYinfFDZ*Bkpc$`yK zaB_9`^iy#0_2eo`Eh^5;&r`5fFwryM;w;ZhDainGjE%TBGg33tGfE(w;*!LYR3K9+ zFR{2dwJ1IBBe* zL_t(IjqTAp5`!=d1W;rUhF#g_6YhW2h@=%{CRK{4aIBs0yn76bSme3K&W5d(cKk>GY55$Mie gkkne* Date: Fri, 4 Aug 2017 13:24:41 -0500 Subject: [PATCH 4/6] Fix MC crash handling (#3222) Ports a fix from /tg/ upstream - previously failure strikes did not distinguish between subsystems when they should've. --- code/controllers/master/master.dm | 5 +++-- code/controllers/master/subsystem.dm | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/code/controllers/master/master.dm b/code/controllers/master/master.dm index 89fa0e91319..4d31c95721b 100644 --- a/code/controllers/master/master.dm +++ b/code/controllers/master/master.dm @@ -110,12 +110,13 @@ var/CURRENT_TICKLIMIT = TICK_LIMIT_RUNNING else msg += "\t [varname] = [varval]\n" log_mc(msg) - + var/datum/controller/subsystem/BadBoy = Master.last_type_processed var/FireHim = FALSE if(istype(BadBoy)) msg = null - switch(++BadBoy.failure_strikes) + LAZYINITLIST(BadBoy.failure_strikes) + switch(++BadBoy.failure_strikes[BadBoy.type]) if(2) msg = "The [BadBoy.name] subsystem was the last to fire for 2 controller restarts. It will be recovered now and disabled if it happens again." FireHim = TRUE diff --git a/code/controllers/master/subsystem.dm b/code/controllers/master/subsystem.dm index 36826a83c07..4944f6d17f2 100644 --- a/code/controllers/master/subsystem.dm +++ b/code/controllers/master/subsystem.dm @@ -40,7 +40,7 @@ var/datum/controller/subsystem/queue_next var/datum/controller/subsystem/queue_prev - var/static/failure_strikes = 0 //How many times we suspect this subsystem has crashed the MC, 3 strikes and you're out! + var/static/list/failure_strikes //How many times we suspect a subsystem type has crashed the MC, 3 strikes and you're out! // Used to initialize the subsystem BEFORE the map has loaded /datum/controller/subsystem/New() From 32a33d9d7caf55d11cc947d6f22110745868543a Mon Sep 17 00:00:00 2001 From: Lohikar Date: Fri, 4 Aug 2017 13:49:56 -0500 Subject: [PATCH 5/6] Lift light tweaks (#3223) changes: Lifts no longer automatically generate lights if they're set to not clear the shaft. Mapped in lifts now have mapped in small lights, only in the lift cabin. --- code/modules/turbolift/turbolift_map.dm | 34 ++++++----- code/modules/turbolift/turbolift_turfs.dm | 4 +- html/changelogs/lohikar-liftlights.yml | 5 ++ maps/aurora/aurora-3_sublevel.dmm | 72 ++++++++++++++++++++--- maps/aurora/aurora-4_mainlevel.dmm | 55 +++++++++++++---- 5 files changed, 132 insertions(+), 38 deletions(-) create mode 100644 html/changelogs/lohikar-liftlights.yml diff --git a/code/modules/turbolift/turbolift_map.dm b/code/modules/turbolift/turbolift_map.dm index ac75ee99fe9..08aa036ec33 100644 --- a/code/modules/turbolift/turbolift_map.dm +++ b/code/modules/turbolift/turbolift_map.dm @@ -160,9 +160,10 @@ // Clear out contents. if(clear_objects) - for(var/atom/movable/thing in checking.contents) - if(thing.simulated) - qdel(thing) + for(var/thing in checking.contents) + var/atom/movable/AM = thing + if(AM.simulated) + qdel(AM) if(tx >= ux && tx <= ex && ty >= uy && ty <= ey) floor_turfs += checking @@ -196,20 +197,21 @@ panel_ext.set_dir(udir) cfloor.ext_panel = panel_ext - // Place lights - var/turf/placing1 = locate(light_x1, light_y1, cz) - var/turf/placing2 = locate(light_x2, light_y2, cz) - var/obj/machinery/light/light1 = new(placing1, light) - var/obj/machinery/light/light2 = new(placing2, light) - if(udir == NORTH || udir == SOUTH) - light1.set_dir(WEST) - light2.set_dir(EAST) - else - light1.set_dir(SOUTH) - light2.set_dir(NORTH) + if (clear_objects) // If we're clearing objects, we're going to need to place lights since they can't be mapped in. + // Place lights + var/turf/placing1 = locate(light_x1, light_y1, cz) + var/turf/placing2 = locate(light_x2, light_y2, cz) + var/obj/machinery/light/light1 = new(placing1, light) + var/obj/machinery/light/light2 = new(placing2, light) + if(udir == NORTH || udir == SOUTH) + light1.set_dir(WEST) + light2.set_dir(EAST) + else + light1.set_dir(SOUTH) + light2.set_dir(NORTH) - light1.no_z_overlay = 1 - light2.no_z_overlay = 1 + light1.no_z_overlay = 1 + light2.no_z_overlay = 1 // Update area. if(az > areas_to_use.len) diff --git a/code/modules/turbolift/turbolift_turfs.dm b/code/modules/turbolift/turbolift_turfs.dm index 632160efaa1..0fb3302885a 100644 --- a/code/modules/turbolift/turbolift_turfs.dm +++ b/code/modules/turbolift/turbolift_turfs.dm @@ -1,2 +1,2 @@ -/turf/simulated/wall/elevator/New(var/newloc) - ..(newloc,"elevatorium") +/turf/simulated/wall/elevator/Initialize(mapload) + . = ..(mapload, "elevatorium") diff --git a/html/changelogs/lohikar-liftlights.yml b/html/changelogs/lohikar-liftlights.yml new file mode 100644 index 00000000000..ecb613f8559 --- /dev/null +++ b/html/changelogs/lohikar-liftlights.yml @@ -0,0 +1,5 @@ +author: Lohikar +delete-after: True +changes: + - maptweak: "Elevators now use small lights instead of tube lights." + - tweak: "Lights will no longer mysteriously float in mid-air in elevator shafts." diff --git a/maps/aurora/aurora-3_sublevel.dmm b/maps/aurora/aurora-3_sublevel.dmm index dc394ef79db..ef2b9112905 100644 --- a/maps/aurora/aurora-3_sublevel.dmm +++ b/maps/aurora/aurora-3_sublevel.dmm @@ -22348,6 +22348,62 @@ }, /turf/simulated/floor/tiled/white, /area/medical/patient_wing) +"Mo" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/turf/simulated/floor{ + icon_state = "plating" + }, +/area/turbolift/engineering_maintenance) +"Mp" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/turf/simulated/floor{ + icon_state = "plating" + }, +/area/turbolift/engineering_maintenance) +"Mq" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor{ + icon_state = "plating" + }, +/area/turbolift/vault_sub) +"Mr" = ( +/obj/machinery/light/small, +/turf/simulated/floor{ + icon_state = "plating" + }, +/area/turbolift/ai_sub) +"Ms" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/turbolift/medical_sub) +"Mt" = ( +/obj/machinery/light/small, +/turf/simulated/floor/tiled, +/area/turbolift/medical_sub) +"Mu" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/turf/simulated/floor{ + icon_state = "plating" + }, +/area/turbolift/research_maintenance) +"Mv" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/turf/simulated/floor{ + icon_state = "plating" + }, +/area/turbolift/research_maintenance) (1,1,1) = {" aa @@ -40183,7 +40239,7 @@ fg dc fG fG -fG +Mo fG fG dc @@ -40954,7 +41010,7 @@ fj dc fG fG -fG +Mp fG fG dc @@ -42295,7 +42351,7 @@ pL rq AW AW -AW +Mu AW AW rq @@ -42809,7 +42865,7 @@ pL rq AW AW -AW +Mv AW AW rq @@ -61811,9 +61867,9 @@ eZ qw eZ rm +Ms rm -rm -rm +Mt rm uf uO @@ -62805,7 +62861,7 @@ ab ab fa fZ -fZ +Mq fZ fZ fZ @@ -70020,7 +70076,7 @@ lz lH lH lH -lH +Mr lH fa ab diff --git a/maps/aurora/aurora-4_mainlevel.dmm b/maps/aurora/aurora-4_mainlevel.dmm index 8215b293a29..cb69cd82e0c 100644 --- a/maps/aurora/aurora-4_mainlevel.dmm +++ b/maps/aurora/aurora-4_mainlevel.dmm @@ -46832,6 +46832,7 @@ /area/maintenance/medbay) "bCd" = ( /obj/structure/flora/pottedplant/random, +/obj/machinery/light/small, /turf/simulated/floor/plating, /area/turbolift/command_sub) "bCe" = ( @@ -62865,6 +62866,36 @@ }, /turf/simulated/floor/tiled/white, /area/rnd/telesci) +"cgg" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/turbolift/main_station) +"cgh" = ( +/obj/machinery/light/small, +/turf/simulated/floor/plating, +/area/turbolift/main_station) +"cgi" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/turbolift/main_station_aux) +"cgj" = ( +/obj/machinery/light/small, +/turf/simulated/floor/plating, +/area/turbolift/main_station_aux) +"cgk" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, +/area/turbolift/cargo_station) +"cgl" = ( +/obj/machinery/light/small, +/turf/simulated/floor/tiled/dark, +/area/turbolift/cargo_station) (1,1,1) = {" aaa @@ -84360,7 +84391,7 @@ bIM bKQ cfZ cgc -bLr +cfZ aLf bNt bNT @@ -84614,10 +84645,10 @@ bHV bIK bIM bIM -bKR -bLr -bLr -bLr +cfX +cfZ +cfZ +cfZ aLf bep aLi @@ -85645,7 +85676,7 @@ bFV bFV bFV bGq -cgf +cge cdW bep bNU @@ -86946,10 +86977,10 @@ bPD bSy bSO bTh +cgk bTh bTh -bTh -bTh +cgl bTh bSO aab @@ -91262,15 +91293,15 @@ aXD aYE aZN baS +cgg baS -baS -baS +cgh baS aZN bix +cgi bix -bix -bix +cgj bix aZN bpV From 40b736dfaa1757a4af2105be924ffd0230355104 Mon Sep 17 00:00:00 2001 From: skull132 Date: Fri, 4 Aug 2017 21:50:49 +0300 Subject: [PATCH 6/6] Changelogs, 04AUG2017 --- html/changelog.html | 7 +++++++ html/changelogs/.all_changelog.yml | 4 ++++ html/changelogs/lohikar-liftlights.yml | 5 ----- 3 files changed, 11 insertions(+), 5 deletions(-) delete mode 100644 html/changelogs/lohikar-liftlights.yml diff --git a/html/changelog.html b/html/changelog.html index 44401144a4d..c647523c7f4 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -56,6 +56,13 @@ -->
    +

    04 August 2017

    +

    Lohikar updated:

    +
      +
    • Elevators now use small lights instead of tube lights.
      • +
    • Lights will no longer mysteriously float in mid-air in elevator shafts.
      • +
    +

    03 August 2017

    Skull132 updated:

      diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index 0acd976365b..bd7d9c24edb 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -4512,3 +4512,7 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. 2017-08-03: Skull132: - rscdel: Genetics has been removed again. +2017-08-04: + Lohikar: + - maptweak: Elevators now use small lights instead of tube lights. + - tweak: Lights will no longer mysteriously float in mid-air in elevator shafts. diff --git a/html/changelogs/lohikar-liftlights.yml b/html/changelogs/lohikar-liftlights.yml deleted file mode 100644 index ecb613f8559..00000000000 --- a/html/changelogs/lohikar-liftlights.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: Lohikar -delete-after: True -changes: - - maptweak: "Elevators now use small lights instead of tube lights." - - tweak: "Lights will no longer mysteriously float in mid-air in elevator shafts."