mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2026-08-26 06:40:08 +01:00
RCD Improvements + Holofans + fixes (#6738)
This commit is contained in:
@@ -81,6 +81,7 @@
|
||||
/obj/item/weapon/storage/bag/trash,
|
||||
/obj/item/weapon/storage/belt/janitor,
|
||||
/obj/item/device/vac_attachment, //CHOMPAdd
|
||||
/obj/item/weapon/holosign_creator, //CHOMPAdd
|
||||
/obj/item/clothing/shoes/galoshes
|
||||
)
|
||||
|
||||
|
||||
@@ -37,6 +37,7 @@
|
||||
/obj/item/clothing/head/beret/engineering/ce/white,
|
||||
/obj/item/weapon/tank/emergency/oxygen/double, //VOREStation Edit: chief gets the good shit
|
||||
/obj/item/weapon/reagent_containers/spray/windowsealant, //VOREStation Add,
|
||||
/obj/item/weapon/rcd/advanced/loaded, //CHOMPAdd
|
||||
/obj/item/weapon/pipe_dispenser) //YW Add
|
||||
|
||||
/obj/structure/closet/secure_closet/engineering_chief/Initialize()
|
||||
@@ -138,6 +139,7 @@
|
||||
/obj/item/clothing/suit/storage/hooded/wintercoat/engineering/atmos,
|
||||
/obj/item/clothing/shoes/boots/winter/atmos,
|
||||
/obj/item/weapon/tank/emergency/oxygen/engi,
|
||||
/obj/item/weapon/holosign_creator/combifan, //CHOMPAdd
|
||||
/obj/item/weapon/storage/belt/utility/atmostech) //VOREStation edit. They don't get a toolbox to fill it from, so why not give a spare one that's full already?
|
||||
|
||||
/obj/structure/closet/secure_closet/atmos_personal/Initialize()
|
||||
|
||||
@@ -365,6 +365,7 @@
|
||||
cover = 60
|
||||
girder_material = "resin"
|
||||
|
||||
/* CHOMPEdit - moved this block to modular_chomp\code\game\objects\items\weapons\rcd.dm
|
||||
/obj/structure/girder/rcd_values(mob/living/user, obj/item/weapon/rcd/the_rcd, passed_mode)
|
||||
var/turf/simulated/T = get_turf(src)
|
||||
if(!istype(T) || T.density)
|
||||
@@ -413,6 +414,7 @@
|
||||
to_chat(user, span("notice", "You deconstruct \the [src]."))
|
||||
qdel(src)
|
||||
return TRUE
|
||||
*/
|
||||
|
||||
/obj/structure/girder/bay
|
||||
wall_type = /turf/simulated/wall/bay
|
||||
|
||||
@@ -248,7 +248,7 @@
|
||||
/obj/structure/grille/broken/rustic
|
||||
icon_state = "grillerustic-b"
|
||||
|
||||
|
||||
/* CHOMPEdit - moved this block to modular_chomp\code\game\objects\items\weapons\rcd.dm
|
||||
/obj/structure/grille/rcd_values(mob/living/user, obj/item/weapon/rcd/the_rcd, passed_mode)
|
||||
switch(passed_mode)
|
||||
if(RCD_WINDOWGRILLE)
|
||||
@@ -281,6 +281,7 @@
|
||||
WD.anchored = TRUE
|
||||
return TRUE
|
||||
return FALSE
|
||||
*/
|
||||
|
||||
/obj/structure/grille/take_damage(var/damage)
|
||||
health -= damage
|
||||
|
||||
@@ -686,6 +686,7 @@
|
||||
return TRUE
|
||||
. = ..()
|
||||
|
||||
/* CHOMPEdit - moved this block to modular_chomp\code\game\objects\items\weapons\rcd.dm
|
||||
/obj/structure/window/rcd_values(mob/living/user, obj/item/weapon/rcd/the_rcd, passed_mode)
|
||||
switch(passed_mode)
|
||||
if(RCD_DECONSTRUCT)
|
||||
@@ -702,3 +703,4 @@
|
||||
qdel(src)
|
||||
return TRUE
|
||||
return FALSE
|
||||
*/
|
||||
Reference in New Issue
Block a user