Fixes master 514 (#5927)

* a

* l

* Update sheet_types.dm
This commit is contained in:
Gandalf
2021-05-25 03:06:58 +01:00
committed by GitHub
parent 8f4b9b3e19
commit aab764575a
98 changed files with 1806 additions and 236478 deletions
@@ -27,7 +27,6 @@
new /obj/item/storage/photo_album/ce(src)
new /obj/item/storage/box/skillchips/engineering(src)
new /obj/item/clothing/suit/hooded/wintercoat/engineering/ce(src)
new /obj/item/construction/plumbing/engineering(src) //SKYRAT EDIT ADDITION
new /obj/item/circuitboard/machine/rodstopper(src) //SKYRAT EDIT ADDITION
/obj/structure/closet/secure_closet/engineering_electrical
@@ -74,7 +73,6 @@
new /obj/item/clothing/glasses/meson/engine(src)
new /obj/item/storage/box/emptysandbags(src)
new /obj/item/storage/bag/construction(src)
new /obj/item/construction/plumbing/engineering(src) //SKYRAT EDIT ADDITION
/obj/structure/closet/secure_closet/atmospherics
-1
View File
@@ -426,7 +426,6 @@
/obj/structure/flora/rock/pile
icon_state = "lavarocks"
desc = "A pile of rocks."
density = FALSE //SKYRAT EDIT ADDITION
//Jungle grass
@@ -507,12 +507,6 @@
integrity_failure = 0.25
armor = list(MELEE = 10, BULLET = 30, LASER = 30, ENERGY = 100, BOMB = 20, BIO = 0, RAD = 0, FIRE = 80, ACID = 70)
//SKYRAT EDIT ADDITION
/obj/structure/table/reinforced/Initialize()
. = ..()
AddElement(/datum/element/liquids_height, 20)
//SKYRAT EDIT END
/obj/structure/table/reinforced/deconstruction_hints(mob/user)
if(deconstruction_ready)
return "<span class='notice'>The top cover has been <i>welded</i> loose and the main frame's <b>bolts</b> are exposed.</span>"