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

Made some object lists less terrible to read

Browse Source
This commit is contained in:
CitadelStationBot
2017-07-18 09:44:43 -05:00
parent c294d781b6
commit a72962c300
236 changed files with 733 additions and 629 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/holiday/easter.dm
+1 -1
View File
@@ -69,7 +69,7 @@
name = "Easter Basket"
icon = 'icons/mob/easter.dmi'
icon_state = "basket"
can_hold = list(/obj/item/weapon/reagent_containers/food/snacks/egg,/obj/item/weapon/reagent_containers/food/snacks/chocolateegg,/obj/item/weapon/reagent_containers/food/snacks/boiledegg)
can_hold = list(/obj/item/weapon/reagent_containers/food/snacks/egg, /obj/item/weapon/reagent_containers/food/snacks/chocolateegg, /obj/item/weapon/reagent_containers/food/snacks/boiledegg)
/obj/item/weapon/storage/bag/easterbasket/proc/countEggs()
cut_overlays()
code/modules/holiday/halloween.dm
+1 -1
View File
@@ -234,7 +234,7 @@
playsound(loc, 'sound/spookoween/insane_low_laugh.ogg', 300, 1)
/mob/living/simple_animal/hostile/retaliate/clown/insane/attackby(obj/item/O, mob/user)
if(istype(O,/obj/item/weapon/nullrod))
if(istype(O, /obj/item/weapon/nullrod))
if(prob(5))
visible_message("[src] finally found the peace it deserves. <i>You hear honks echoing off into the distance.</i>")
playsound(loc, 'sound/spookoween/insane_low_laugh.ogg', 300, 1)