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

Adds Zombies (Admin-spawn) (#25381)

Browse Source 
* fuck it good enough

* Apply suggestions from code review

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Signed-off-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

* TRIPLE-REVIEW

* this should do it

* wow

* bruh

* FIX

* fix

* yeah

* sirryan review

* aaaaa

* Apply suggestions from code review

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

---------

Signed-off-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
This commit is contained in:
Contrabang
2024-05-31 02:17:31 +00:00
committed by GitHub
co-authored by Burzah DGamerL
parent 247e24ba9f
commit bc0c8344cf
62 changed files with 1326 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/storage/fancy.dm
+9 -13
View File
@@ -424,23 +424,19 @@
else
. += "ledb"
/obj/item/storage/lockbox/vials/AltClick(mob/user)
if(!Adjacent(user))
return
if(broken)
to_chat(user, "<span class='warning'>It appears to be broken.</span>")
return
if(allowed(user))
locked = !locked
to_chat(user, "<span class='notice'>You [locked ? "lock" : "unlock"] [src].</span>")
update_icon()
else
to_chat(user, "<span class='warning'>Access denied.</span>")
/obj/item/storage/lockbox/vials/attackby(obj/item/I, mob/user, params)
..()
update_icon()
/obj/item/storage/lockbox/vials/zombie_cure
name = "secure vial storage box - 'Anti-Plague Sequences'"
/obj/item/storage/lockbox/vials/zombie_cure/populate_contents()
for(var/count in 1 to 4)
var/obj/item/reagent_containers/glass/bottle/cure = new /obj/item/reagent_containers/glass/bottle(src)
cure.reagents.add_reagent("zombiecure[count]", 50)
var/datum/reagent/temp = GLOB.chemical_reagents_list["zombiecure[count]"]
cure.name = "[lowertext(temp.name)] bottle"
///Aquatic Starter Kit
code/game/objects/items/weapons/storage/lockbox.dm
+16 -6
View File
@@ -22,16 +22,14 @@
if(check_access(W))
locked = !locked
if(locked)
icon_state = icon_locked
to_chat(user, "<span class='warning'>You lock \the [src]!</span>")
if(user.s_active)
user.s_active.close(user)
return
else
icon_state = icon_closed
to_chat(user, "<span class='warning'>You unlock \the [src]!</span>")
origin_tech = null //wipe out any origin tech if it's unlocked in any way so you can't double-dip tech levels at R&D.
return
update_icon()
return
else
to_chat(user, "<span class='warning'>Access denied.</span>")
return
@@ -50,13 +48,25 @@
if(broken)
to_chat(user, "<span class='warning'>It appears to be broken.</span>")
return
if(!locked && user.s_active != src)
return ..()
if(allowed(user))
locked = !locked
to_chat(user, "<span class='notice'>You [locked ? "lock" : "unlock"] [src].</span>")
icon_state = "[locked ? icon_locked : icon_closed]"
update_icon()
if(user.s_active == src)
close(user)
else
to_chat(user, "<span class='warning'>Access denied.</span>")
/obj/item/storage/lockbox/update_icon_state()
if(broken)
icon_state = icon_broken
else if(locked)
icon_state = icon_locked
else
icon_state = icon_closed // good variable name bro
/obj/item/storage/lockbox/show_to(mob/user as mob)
if(locked)
to_chat(user, "<span class='warning'>It's locked!</span>")
@@ -76,9 +86,9 @@
broken = TRUE
locked = FALSE
desc = "It appears to be broken."
icon_state = icon_broken
to_chat(user, "<span class='notice'>You unlock \the [src].</span>")
origin_tech = null //wipe out any origin tech if it's unlocked in any way so you can't double-dip tech levels at R&D.
update_icon()
return
/obj/item/storage/lockbox/hear_talk(mob/living/M as mob, list/message_pieces)