cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-22 20:48:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8427 from Cheridan/day3_collars

Browse Source 
Event Day 3 - Pet Collars!
This commit is contained in:
Swag McYolosteinen
2015-03-22 19:37:12 +01:00
parent 0e5c2b189b e5c3d421db
commit 53e40ec315
28 changed files with 137 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/crates_lockers/closets/crittercrate.dm
+6 -6
View File
@@ -44,11 +44,11 @@
/obj/structure/closet/critter/corgi
name = "corgi crate"
content_mob = /mob/living/simple_animal/corgi
content_mob = /mob/living/simple_animal/pet/corgi
/obj/structure/closet/critter/corgi/New()
if(prob(50))
content_mob = /mob/living/simple_animal/corgi/Lisa
content_mob = /mob/living/simple_animal/pet/corgi/Lisa
..()
/obj/structure/closet/critter/cow
@@ -69,20 +69,20 @@
/obj/structure/closet/critter/cat
name = "cat crate"
content_mob = /mob/living/simple_animal/cat
content_mob = /mob/living/simple_animal/pet/cat
/obj/structure/closet/critter/cat/New()
if(prob(50))
content_mob = /mob/living/simple_animal/cat/Proc
content_mob = /mob/living/simple_animal/pet/cat/Proc
..()
/obj/structure/closet/critter/pug
name = "pug crate"
content_mob = /mob/living/simple_animal/pug
content_mob = /mob/living/simple_animal/pet/pug
/obj/structure/closet/critter/fox
name = "fox crate"
content_mob = /mob/living/simple_animal/fox
content_mob = /mob/living/simple_animal/pet/fox
/obj/structure/closet/critter/butterfly
name = "butterflies crate"
code/game/objects/structures/crates_lockers/closets/secure/security.dm
+1
View File
@@ -55,6 +55,7 @@
new /obj/item/clothing/glasses/sunglasses(src)
new /obj/item/weapon/mining_voucher(src)
new /obj/item/weapon/gun/energy/gun(src)
new /obj/item/clothing/tie/petcollar(src)
return