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

Merge remote-tracking branch 'upstream/master' into his-grace-ascended

Browse Source
This commit is contained in:
Fox McCloud
2021-03-11 14:12:01 -05:00
parent 2a8bb6c5c0 1d3e68544f
commit 35824b4e94
606 changed files with 1755 additions and 4436 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mining/lavaland/loot/colossus_loot.dm
+1 -1
View File
@@ -377,7 +377,7 @@
holder_animal.mind.AddSpell(P)
holder_animal.verbs -= /mob/living/verb/pulled
/obj/structure/closet/stasis/dump_contents(var/kill = 1)
/obj/structure/closet/stasis/dump_contents(kill = 1)
STOP_PROCESSING(SSobj, src)
for(var/mob/living/L in src)
REMOVE_TRAIT(L, TRAIT_MUTE, STASIS_MUTE)
code/modules/mining/ores_coins.dm
+1 -1
View File
@@ -261,7 +261,7 @@ GLOBAL_LIST_INIT(sand_recipes, list(\
else
..()
/obj/item/twohanded/required/gibtonite/bullet_act(var/obj/item/projectile/P)
/obj/item/twohanded/required/gibtonite/bullet_act(obj/item/projectile/P)
GibtoniteReaction(P.firer)
..()