mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-10 10:12:45 +00:00
Removes bear traps from the custodial closet, adds autolathe recipe
This commit is contained in:
@@ -391,6 +391,12 @@
|
||||
hidden = 1
|
||||
category = "Devices and Components"
|
||||
|
||||
/datum/autolathe/recipe/beartrap
|
||||
name = "mechanical trap"
|
||||
path = /obj/item/weapon/beartrap
|
||||
hidden = 1
|
||||
category = "Devices and Components"
|
||||
|
||||
/datum/autolathe/recipe/welder_industrial
|
||||
name = "industrial welding tool"
|
||||
path = /obj/item/weapon/weldingtool/largetank
|
||||
|
||||
@@ -9,6 +9,7 @@
|
||||
throwforce = 0
|
||||
w_class = 3
|
||||
origin_tech = "materials=1"
|
||||
matter = list(DEFAULT_WALL_MATERIAL = 18750)
|
||||
var/deployed = 0
|
||||
|
||||
/obj/item/weapon/beartrap/suicide_act(mob/user)
|
||||
|
||||
19
html/changelogs/HarpyEagle-traps.yml
Normal file
19
html/changelogs/HarpyEagle-traps.yml
Normal file
@@ -0,0 +1,19 @@
|
||||
# bugfix
|
||||
# wip (For works in progress)
|
||||
# tweak
|
||||
# soundadd
|
||||
# sounddel
|
||||
# rscadd (general adding of nice things)
|
||||
# rscdel (general deleting of nice things)
|
||||
# imageadd
|
||||
# imagedel
|
||||
# maptweak
|
||||
# spellcheck (typo fixes)
|
||||
# experiment
|
||||
|
||||
author: HarpyEagle
|
||||
delete-after: True
|
||||
|
||||
changes:
|
||||
- bugfix: "Mechanical traps no longer spawn in the janitor's locker."
|
||||
- rscadd: "Mechanical traps can now be printed with a hacked autolathe."
|
||||
@@ -5010,7 +5010,7 @@
|
||||
"bSr" = (/obj/item/weapon/paper_bin{pixel_x = -3; pixel_y = 7},/obj/item/weapon/pen,/obj/structure/table/steel,/turf/simulated/floor,/area/janitor)
|
||||
"bSs" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 1},/turf/simulated/floor{icon_state = "white"},/area/crew_quarters/heads/cmo)
|
||||
"bSt" = (/obj/machinery/computer/crew,/obj/machinery/light,/turf/simulated/floor{dir = 6; icon_state = "whiteblue"; tag = "icon-whitehall (WEST)"},/area/crew_quarters/heads/cmo)
|
||||
"bSu" = (/obj/item/weapon/beartrap,/obj/item/weapon/storage/box/mousetraps,/obj/item/weapon/storage/box/mousetraps,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/item/weapon/beartrap,/turf/simulated/floor,/area/janitor)
|
||||
"bSu" = (/obj/item/weapon/storage/box/mousetraps,/obj/item/weapon/storage/box/mousetraps,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor,/area/janitor)
|
||||
"bSv" = (/obj/structure/disposalpipe/segment,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/unary/vent_pump/on{dir = 8},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay2)
|
||||
"bSw" = (/obj/machinery/hologram/holopad,/turf/simulated/floor{icon_state = "white"},/area/medical/sleeper)
|
||||
"bSx" = (/obj/machinery/firealarm{dir = 1; pixel_y = -24},/obj/machinery/light,/obj/machinery/atmospherics/unary/vent_pump/on{dir = 1},/turf/simulated/floor{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/crew_quarters/medbreak)
|
||||
|
||||
Reference in New Issue
Block a user