diff --git a/code/game/objects/items/weapons/policetape.dm b/code/game/objects/items/weapons/policetape.dm index dd843e0ea4f..b30226054a0 100644 --- a/code/game/objects/items/weapons/policetape.dm +++ b/code/game/objects/items/weapons/policetape.dm @@ -61,6 +61,19 @@ var/list/tape_roll_applications = list() req_one_access = list(access_medical_equip) icon_base = "medical" +/obj/item/taperoll/science + name = "science tape" + desc = "A high-tech roll of science tape, used to prevent curious onlookers from failing into a research-borne singularity." + icon_state = "science_start" + tape_type = /obj/item/tape/science + icon_base = "science" + +/obj/item/tape/science + name = "science tape" + desc = "A length of science tape. Better not cross it." + req_one_access = list(access_research) + icon_base = "science" + /obj/item/taperoll/engineering name = "engineering tape" desc = "A roll of engineering tape used to block off working areas from the public." diff --git a/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm b/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm index b4c7b16f925..2c6b36784b0 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm @@ -16,7 +16,7 @@ new /obj/item/device/radio/headset/headset_sci/alt(src) new /obj/item/tank/air(src) new /obj/item/clothing/mask/gas(src) - + new /obj/item/taperoll/science(src) /obj/structure/closet/secure_closet/RD name = "research director's locker" @@ -47,6 +47,7 @@ new /obj/item/device/pin_extractor(src) new /obj/item/storage/box/fancy/keypouch/sci(src) new /obj/item/storage/box/tethers(src) + new /obj/item/taperoll/science(src) /obj/structure/closet/secure_closet/RD2 name = "research director's attire" diff --git a/code/modules/research/xenoarchaeology/misc.dm b/code/modules/research/xenoarchaeology/misc.dm index 8c8ca46034a..8f713a4797f 100644 --- a/code/modules/research/xenoarchaeology/misc.dm +++ b/code/modules/research/xenoarchaeology/misc.dm @@ -60,7 +60,7 @@ //---- Lockers and closets /obj/structure/closet/secure_closet/xenoarchaeologist - name = "Xenoarchaeologist Locker" + name = "xenoarchaeologist locker" req_access = list(access_tox_storage) icon_state = "secureres1" icon_closed = "secureres" @@ -69,20 +69,18 @@ icon_broken = "secureresbroken" icon_off = "secureresoff" - New() - ..() - sleep(2) - new /obj/item/clothing/under/rank/scientist(src) - new /obj/item/clothing/suit/storage/toggle/labcoat(src) - new /obj/item/clothing/shoes/science(src) - new /obj/item/clothing/glasses/science(src) - new /obj/item/device/radio/headset/headset_sci(src) - new /obj/item/storage/belt/archaeology(src) - new /obj/item/storage/box/excavation(src) - return +/obj/structure/closet/secure_closet/xenoarchaeologist/fill() + new /obj/item/clothing/under/rank/scientist(src) + new /obj/item/clothing/suit/storage/toggle/labcoat(src) + new /obj/item/clothing/shoes/science(src) + new /obj/item/clothing/glasses/science(src) + new /obj/item/device/radio/headset/headset_sci(src) + new /obj/item/storage/belt/archaeology(src) + new /obj/item/storage/box/excavation(src) + new /obj/item/taperoll/science(src) /obj/structure/closet/excavation - name = "Excavation tools" + name = "excavation tools" icon_state = "toolcloset" icon_closed = "toolcloset" icon_opened = "toolclosetopen" diff --git a/html/changelogs/geeves-science_tapes.yml b/html/changelogs/geeves-science_tapes.yml new file mode 100644 index 00000000000..a2686b4f961 --- /dev/null +++ b/html/changelogs/geeves-science_tapes.yml @@ -0,0 +1,6 @@ +author: Geeves, CNEGecko + +delete-after: True + +changes: + - rscadd: "Added science taperolls to the science sub-level, as well as various science lockers." \ No newline at end of file diff --git a/icons/policetape.dmi b/icons/policetape.dmi index 7a71bdefed9..a12e0fa58ce 100644 Binary files a/icons/policetape.dmi and b/icons/policetape.dmi differ diff --git a/maps/aurora/aurora-3_sublevel.dmm b/maps/aurora/aurora-3_sublevel.dmm index 2fac414c909..61e5a7ab33f 100644 --- a/maps/aurora/aurora-3_sublevel.dmm +++ b/maps/aurora/aurora-3_sublevel.dmm @@ -16680,6 +16680,7 @@ /obj/effect/floor_decal/corner_wide/mauve/full{ dir = 1 }, +/obj/item/taperoll/science, /turf/simulated/floor/tiled/white, /area/rnd/test_range) "aHx" = ( @@ -20656,6 +20657,7 @@ dir = 5 }, /obj/item/folder/purple, +/obj/item/taperoll/science, /turf/simulated/floor/tiled/dark, /area/outpost/research/hallway) "aQx" = ( @@ -21040,6 +21042,7 @@ /obj/structure/table/standard, /obj/item/reagent_containers/spray/chemsprayer/xenobiology, /obj/item/reagent_containers/spray/chemsprayer/xenobiology, +/obj/item/taperoll/science, /turf/simulated/floor/tiled/white, /area/rnd/xenobiology) "aRA" = ( @@ -21262,6 +21265,7 @@ dir = 1 }, /obj/item/folder/purple, +/obj/item/taperoll/science, /turf/simulated/floor/tiled/dark, /area/outpost/research/hallway) "aSk" = ( @@ -31510,6 +31514,7 @@ /obj/effect/floor_decal/corner_wide/mauve{ dir = 5 }, +/obj/item/taperoll/science, /turf/simulated/floor/tiled/white, /area/rnd/xenobiology/xenoflora) "mZC" = (