cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 02:34:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Earlyports some bugfixes

Browse Source
This commit is contained in:
Unknown
2020-03-20 00:35:55 -04:00
parent e570838e46
commit a40df7dda7
3 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/defines/obj.dm
View File

@@ -124,7 +124,7 @@ var/global/list/PDA_Manifest = list()
if(depthead && car.len != 1) if(depthead && car.len != 1)
car.Swap(1,car.len) car.Swap(1,car.len)
if(SSjob.is_job_in_department(real_rank, DEPARTMENT_CARGO)) if(SSjob.is_job_in_department(real_rank, DEPARTMENT_CIVILIAN))
civ[++civ.len] = list("name" = name, "rank" = rank, "active" = isactive) civ[++civ.len] = list("name" = name, "rank" = rank, "active" = isactive)
department = 1 department = 1
if(depthead && civ.len != 1) if(depthead && civ.len != 1)

4
code/game/objects/items/toys.dm
View File

@@ -902,7 +902,7 @@
/obj/structure/plushie/attack_hand(mob/user) /obj/structure/plushie/attack_hand(mob/user)
user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN) user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
if(stored_item && !searching) if(stored_item && opened && !searching)
searching = TRUE searching = TRUE
if(do_after(user, 10)) if(do_after(user, 10))
to_chat(user, "You find \icon[stored_item] [stored_item] in [src]!") to_chat(user, "You find \icon[stored_item] [stored_item] in [src]!")
@@ -999,7 +999,7 @@
to_chat(user, "<i>You can see something in there...</i>") to_chat(user, "<i>You can see something in there...</i>")
/obj/item/toy/plushie/attack_self(mob/user as mob) /obj/item/toy/plushie/attack_self(mob/user as mob)
if(stored_item && !searching) if(stored_item && opened && !searching)
searching = TRUE searching = TRUE
if(do_after(user, 10)) if(do_after(user, 10))
to_chat(user, "You find \icon[stored_item] [stored_item] in [src]!") to_chat(user, "You find \icon[stored_item] [stored_item] in [src]!")

1
code/modules/mob/living/carbon/human/life.dm
View File

@@ -1523,7 +1523,6 @@
else else
shock_stage = min(shock_stage, 160) shock_stage = min(shock_stage, 160)
shock_stage = max(shock_stage-1, 0) shock_stage = max(shock_stage-1, 0)
return
if(stat) if(stat)
return 0 return 0