cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-20 03:26:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2664 from Verkister/buppers

Browse Source 
Fixes non-dogborgs butting into dogborg icon update territory.
This commit is contained in:
Arokha Sieyes
2018-01-05 10:11:13 -05:00
committed by GitHub
parent 7bd32b056d 43d1db6515
commit ce0b3e9678
3 changed files with 37 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm
+15 -15
View File
@@ -256,12 +256,12 @@
if(patient in contents)
if(patient_laststat != patient.stat)
if(patient.stat & DEAD)
hound.sleeper_r = 1
hound.sleeper_g = 0
hound.sleeper_r = TRUE
hound.sleeper_g = FALSE
patient_laststat = patient.stat
else
hound.sleeper_r = 0
hound.sleeper_g = 1
hound.sleeper_r = FALSE
hound.sleeper_g = TRUE
patient_laststat = patient.stat
//Update icon
hound.updateicon()
@@ -273,12 +273,12 @@
for(var/mob/living/carbon/human/C in contents)
patient = C
if(patient.stat & DEAD)
hound.sleeper_r = 1
hound.sleeper_g = 0
hound.sleeper_r = TRUE
hound.sleeper_g = FALSE
patient_laststat = patient.stat
else
hound.sleeper_r = 0
hound.sleeper_g = 1
hound.sleeper_r = FALSE
hound.sleeper_g = TRUE
patient_laststat = patient.stat
//Update icon and return new patient
hound.updateicon()
@@ -286,13 +286,13 @@
//Cleaning looks better with red on, even with nobody in it
if((cleaning && !patient) || (length(contents) > 11))
hound.sleeper_r = 1
hound.sleeper_g = 0
hound.sleeper_r = TRUE
hound.sleeper_g = FALSE
//Couldn't find anyone, and not cleaning
else if(!cleaning && !patient)
hound.sleeper_r = 0
hound.sleeper_g = 0
hound.sleeper_r = FALSE
hound.sleeper_g = FALSE
patient_laststat = null
patient = null
@@ -522,7 +522,7 @@
user.visible_message("<span class='warning'>[hound.name]'s garbage processor groans lightly as [target.name] slips inside.</span>", "<span class='notice'>Your garbage compactor groans lightly as [target] slips inside.</span>")
playsound(hound, 'sound/vore/gulp.ogg', 30, 1)
if(length(contents) > 11) //grow that tum after a certain junk amount
hound.sleeper_r = 1
hound.sleeper_r = TRUE
hound.updateicon()
if(UI_open == 1)
sleeperUI(usr)
@@ -537,7 +537,7 @@
user.visible_message("<span class='warning'>[hound.name]'s garbage processor groans lightly as [trashmouse] slips inside.</span>", "<span class='notice'>Your garbage compactor groans lightly as [trashmouse] slips inside.</span>")
playsound(hound, 'sound/vore/gulp.ogg', 30, 1)
if(length(contents) > 11) //grow that tum after a certain junk amount
hound.sleeper_r = 1
hound.sleeper_r = TRUE
hound.updateicon()
if(UI_open == 1)
sleeperUI(usr)
@@ -559,7 +559,7 @@
processing_objects.Add(src)
user.visible_message("<span class='warning'>[hound.name]'s garbage processor groans lightly as [trashman] slips inside.</span>", "<span class='notice'>Your garbage compactor groans lightly as [trashman] slips inside.</span>")
playsound(hound, 'sound/vore/gulp.ogg', 80, 1)
hound.sleeper_r = 1
hound.sleeper_r = TRUE
hound.updateicon()
if(UI_open == 1)
sleeperUI(usr)
code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm
+4
View File
@@ -81,6 +81,7 @@
//R.icon_state = "k9"
R.pixel_x = -16
R.old_x = -16
R.dogborg = TRUE
..()
/obj/item/weapon/robot_module/robot/knine/respawn_consumable(var/mob/living/silicon/robot/R, var/amount)
@@ -131,6 +132,7 @@
//R.icon_state = "medihound"
R.pixel_x = -16
R.old_x = -16
R.dogborg = TRUE
..()
/obj/item/weapon/robot_module/robot/ert
@@ -157,6 +159,7 @@
R.hands.icon = 'icons/mob/screen1_robot_vr.dmi'
R.pixel_x = -16
R.old_x = -16
R.dogborg = TRUE
..()
/obj/item/weapon/robot_module/robot/scrubpup
@@ -179,6 +182,7 @@
//R.icon_state = "scrubpup"
R.pixel_x = -16
R.old_x = -16
R.dogborg = TRUE
..()
/obj/item/weapon/robot_module/robot/scrubpup/respawn_consumable(var/mob/living/silicon/robot/R, var/amount)
code/modules/mob/living/silicon/robot/robot_vr.dm
+18 -18
View File
@@ -5,6 +5,7 @@
var/pounce_cooldown = 0
var/pounce_cooldown_time = 40
var/leap_at
var/dogborg = FALSE
/mob/living/silicon/robot/verb/robot_nom(var/mob/living/T in oview(1))
set name = "Robot Nom"
@@ -17,24 +18,23 @@
/mob/living/silicon/robot/updateicon()
..()
if(icon == 'icons/mob/widerobot_vr.dmi' || 'icons/mob/64x64robot_vr.dmi')
if(stat == CONSCIOUS)
if(sleeper_g == 1)
overlays += "[module_sprites[icontype]]-sleeper_g"
if(sleeper_r == 1)
overlays += "[module_sprites[icontype]]-sleeper_r"
if(istype(module_active,/obj/item/weapon/gun/energy/laser/mounted))
overlays += "laser"
if(istype(module_active,/obj/item/weapon/gun/energy/taser/mounted/cyborg))
overlays += "taser"
if(resting)
overlays.Cut() // Hide that gut for it has no ground sprite yo.
icon_state = "[module_sprites[icontype]]-rest"
else
icon_state = module_sprites[icontype]
else if(stat == DEAD)
icon_state = "[module_sprites[icontype]]-wreck"
overlays += "wreck-overlay"
if(dogborg == TRUE && stat == CONSCIOUS)
if(sleeper_g == TRUE)
overlays += "[module_sprites[icontype]]-sleeper_g"
if(sleeper_r == TRUE)
overlays += "[module_sprites[icontype]]-sleeper_r"
if(istype(module_active,/obj/item/weapon/gun/energy/laser/mounted))
overlays += "laser"
if(istype(module_active,/obj/item/weapon/gun/energy/taser/mounted/cyborg))
overlays += "taser"
if(resting)
overlays.Cut() // Hide that gut for it has no ground sprite yo.
icon_state = "[module_sprites[icontype]]-rest"
else
icon_state = "[module_sprites[icontype]]"
if(dogborg == TRUE && stat == DEAD)
icon_state = "[module_sprites[icontype]]-wreck"
overlays += "wreck-overlay"
/mob/living/silicon/robot/Move(a, b, flag)