cyberpresidentvanellope/Hyper-Station-13
1
0
Fork 0
mirror of https://github.com/quotefox/Hyper-Station-13.git synced 2026-07-18 19:22:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1563 from sarcoph/master

Browse Source 
fixes dogborg sleepers
This commit is contained in:
Dahlular
2022-03-08 21:41:45 -07:00
committed by GitHub
parent 888ca227f0 bb3927269f
commit 35703b7eae
14 changed files with 396 additions and 275 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/silicon/robot/inventory.dm
+1 -2
View File
@@ -25,8 +25,7 @@
disabler = FALSE
update_icons() //PUT THE GUN AWAY
else if(istype(O,/obj/item/dogborg/sleeper))
sleeper_g = FALSE
sleeper_r = FALSE
sleeper_state = BORGBELLY_NONE
update_icons()
var/obj/item/dogborg/sleeper/S = O
S.go_out() //this should stop edgecase deletions
code/modules/mob/living/silicon/robot/robot.dm
+8 -4
View File
@@ -654,10 +654,14 @@
if(disabler)
add_overlay("disabler")//ditto
if(sleeper_g && module.sleeper_overlay)
add_overlay("[module.sleeper_overlay]_g[sleeper_nv ? "_nv" : ""]")
if(sleeper_r && module.sleeper_overlay)
add_overlay("[module.sleeper_overlay]_r[sleeper_nv ? "_nv" : ""]")
if(module.sleeper_overlay)
var/sleeper_overlay_state = ""
switch(sleeper_state)
if(BORGBELLY_NONE) sleeper_overlay_state = ""
if(BORGBELLY_GREEN) sleeper_overlay_state = "_g"
if(BORGBELLY_RED) sleeper_overlay_state = "_r"
add_overlay("[module.sleeper_overlay][sleeper_overlay_state]")
if(module.dogborg == TRUE)
if(resting)
cut_overlays()