cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-26 05:27:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Job Perks - True Professionals (#29478)

Browse Source 
* ddsadsa

ddsadsa

* moderate again

* revert

* medical first steps

* more work

* lots more work done

* more progress

* finished up

* attack chain linter

* attack chain update

* attack chain work

* fixes + chemist update

* gives comments
This commit is contained in:
Kyani
2025-06-13 19:40:29 +00:00
committed by GitHub
parent 341058c682
commit 586e2e6c4d
31 changed files with 553 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/crates_lockers/closets.dm
+9 -7
View File
@@ -218,30 +218,32 @@
update_appearance()
return TRUE
/obj/structure/closet/proc/close()
/obj/structure/closet/proc/close(mob/user)
if(!opened)
return FALSE
if(!can_close())
return FALSE
var/itemcount = 0
var/temp_capacity = storage_capacity
if(user && user.mind && HAS_TRAIT(user.mind, TRAIT_PACK_RAT))
temp_capacity *= 1.5
//Cham Projector Exception
for(var/obj/effect/dummy/chameleon/AD in loc)
if(itemcount >= storage_capacity)
if(itemcount >= temp_capacity)
break
AD.forceMove(src)
itemcount++
for(var/obj/item/I in loc)
if(itemcount >= storage_capacity)
if(itemcount >= temp_capacity)
break
if(!I.anchored)
I.forceMove(src)
itemcount++
for(var/mob/M in loc)
if(itemcount >= storage_capacity)
if(itemcount >= temp_capacity)
break
if(isobserver(M))
continue
@@ -264,7 +266,7 @@
return TRUE
/obj/structure/closet/proc/toggle(mob/user)
if(!(opened ? close() : open()))
if(!(opened ? close(user) : open()))
to_chat(user, "<span class='notice'>It won't budge!</span>")
/obj/structure/closet/proc/bust_open()
@@ -498,7 +500,7 @@
if(opened && can_close())
target.forceMove(src)
visible_message("<span class='danger'>[attacker] shoves [target] inside [src]!</span>", "<span class='warning'>You hear a thud, and something clangs shut.</span>")
close()
close(attacker)
add_attack_logs(attacker, target, "shoved into [src]")
return TRUE