shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #7183 from Citadel-Station-13/deathride58-patch-1

Browse Source 
Fixes a merge conflict
This commit is contained in:
LetterJay
2018-06-19 09:40:11 -05:00
committed by GitHub
parent 1438afa013 7150c207aa
commit a385f9e76f
1 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/clothing/masks/miscellaneous.dm
+1 -6
View File
@@ -122,13 +122,8 @@
message = pick("Ree!!", "Reee!!","REEE!!","REEEEE!!") //but its usually just angry gibberish,
return message
<<<<<<< HEAD
obj/item/clothing/mask/frog/cursed
flags_1 = NODROP_1 //reee!!
=======
/obj/item/clothing/mask/frog/cursed
item_flags = NODROP //reee!!
>>>>>>> 6d558b6... puts a / at the start of some obj instances (#38545)
flags_1 = NODROP_1 //reee!!
/obj/item/clothing/mask/frog/cursed/attack_self(mob/user)
return //no voicebox to alter.