cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-11 07:03:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

[serious april pr pls no close] Adds the magic nanny bag. (#20774)

Browse Source 
* IT'S NOT A GRANNY BAG

* other tweaks to put out

* Restricted on raging

* Update code/game/objects/items/weapons/storage/backpack.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* defined

* Update code/game/objects/items/weapons/storage/backpack.dm

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>

* changes requested

* no slime coring the super food

* actually let the pie live, the meds can be found in pill bottles in space, just not the steak

* merge conflict bullshit

* pain, suffering even

* icon handling

* M-M-M-ERGE CONFLICTS MY BELOVED

* Apply suggestions from code review

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>

* s34n comments

* I can read and speak the english language™️

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
This commit is contained in:
Qwertytoforty
2023-06-02 16:49:26 -04:00
committed by GitHub
parent 3f87165a03
commit 8e6ed2f284
9 changed files with 225 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mining/lavaland/loot/ashdragon_loot.dm
+1 -1
View File
@@ -234,7 +234,7 @@
if(is_type_in_typecache(target, banned_turfs))
return
if(!is_mining_level(user.z)) //Will only spawn a few sparks if not on mining z level
if(!is_mining_level(user.z) && !iswizard(user)) //Will only spawn a few sparks if not on mining z level, unless a wizard uses it.
timer = world.time + create_delay + 1
user.visible_message("<span class='danger'>[user]'s [src] malfunctions!</span>")
do_sparks(5, FALSE, user)
code/modules/mining/lavaland/loot/hierophant_loot.dm
+1 -1
View File
@@ -52,7 +52,7 @@
if(world.time < timer)
return
if(!is_mining_level(user.z))//Will only spawn a few sparks if not on mining z level
if(!is_mining_level(user.z) && !iswizard(user)) //Will only spawn a few sparks if not on mining z level, unless a wizard uses it.
timer = world.time + cooldown_time
user.visible_message("<span class='danger'>[user]'s hierophant club malfunctions!</span>")
do_sparks(5, FALSE, user)