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 #7146 from paprka/wcoatr

Browse Source 
Tones down winter coat spawning, removes santa hat spawns
This commit is contained in:
Swag McYolosteinen
2015-01-20 17:57:24 +01:00
parent 63cb7dad4a ae21c54774
commit 48d032bd88
8 changed files with 11 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/crates_lockers/closets/secure/cargo.dm
+1 -2
View File
@@ -16,7 +16,6 @@
new /obj/item/clothing/gloves/fingerless(src)
new /obj/item/clothing/head/soft(src)
// new /obj/item/weapon/cartridge/quartermaster(src)
new /obj/item/clothing/suit/toggle/wintercoat/cargo(src)
return
/obj/structure/closet/secure_closet/quartermaster
@@ -31,6 +30,7 @@
/obj/structure/closet/secure_closet/quartermaster/New()
..()
new /obj/item/clothing/suit/toggle/wintercoat/cargo(src)
new /obj/item/clothing/under/rank/cargo(src)
new /obj/item/clothing/shoes/sneakers/brown(src)
new /obj/item/device/radio/headset/headset_cargo(src)
@@ -41,5 +41,4 @@
new /obj/item/clothing/mask/gas(src)
new /obj/item/clothing/glasses/meson(src)
new /obj/item/clothing/head/soft(src)
new /obj/item/clothing/suit/toggle/wintercoat/cargo(src)
return
code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
+2 -3
View File
@@ -11,6 +11,8 @@
/obj/structure/closet/secure_closet/engineering_chief/New()
..()
new /obj/item/clothing/suit/toggle/wintercoat/engineering(src)
new /obj/item/clothing/suit/toggle/wintercoat/engineering/atmos(src)
if(prob(50))
new /obj/item/weapon/storage/backpack/industrial(src)
else
@@ -30,7 +32,6 @@
new /obj/item/clothing/mask/gas(src)
new /obj/item/device/multitool(src)
new /obj/item/device/flash/handheld(src)
new /obj/item/clothing/suit/toggle/wintercoat/engineering(src)
return
/obj/structure/closet/secure_closet/engineering_electrical
@@ -109,7 +110,6 @@
new /obj/item/clothing/suit/hazardvest(src)
new /obj/item/clothing/mask/gas(src)
new /obj/item/clothing/glasses/meson(src)
new /obj/item/clothing/suit/toggle/wintercoat/engineering(src)
return
/obj/structure/closet/secure_closet/atmospherics
@@ -133,5 +133,4 @@
new /obj/item/weapon/watertank/atmos(src)
new /obj/item/clothing/suit/fire/atmos(src)
new /obj/item/clothing/head/hardhat/atmos(src)
new /obj/item/clothing/suit/toggle/wintercoat/engineering/atmos(src)
return
code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm
+1 -1
View File
@@ -11,6 +11,7 @@
New()
..()
new /obj/item/clothing/suit/toggle/wintercoat/hydro(src)
switch(rand(1,2))
if(1)
new /obj/item/clothing/suit/apron(src)
@@ -23,5 +24,4 @@
new /obj/item/clothing/mask/bandana(src)
new /obj/item/weapon/minihoe(src)
new /obj/item/weapon/hatchet(src)
new /obj/item/clothing/suit/toggle/wintercoat/hydro(src)
return
code/game/objects/structures/crates_lockers/closets/secure/medical.dm
+1 -2
View File
@@ -73,7 +73,6 @@
new /obj/item/clothing/gloves/color/latex/nitrile(src)
new /obj/item/weapon/storage/belt/medical(src)
new /obj/item/clothing/glasses/hud/health(src)
new /obj/item/clothing/suit/toggle/wintercoat/medical(src)
return
@@ -90,6 +89,7 @@
/obj/structure/closet/secure_closet/CMO/New()
..()
new /obj/item/clothing/suit/toggle/wintercoat/medical(src)
if(prob(50))
new /obj/item/weapon/storage/backpack/medic(src)
else
@@ -105,7 +105,6 @@
new /obj/item/clothing/gloves/color/latex/nitrile(src)
new /obj/item/weapon/storage/belt/medical(src)
new /obj/item/device/flash/handheld(src)
new /obj/item/clothing/suit/toggle/wintercoat/medical(src)
new /obj/item/weapon/reagent_containers/hypospray/CMO(src)
return
code/game/objects/structures/crates_lockers/closets/secure/personal.dm
-2
View File
@@ -51,8 +51,6 @@
contents = list()
new /obj/item/weapon/storage/backpack/satchel/withwallet( src )
new /obj/item/device/radio/headset( src )
new /obj/item/clothing/suit/toggle/wintercoat(src)
new /obj/item/clothing/head/santa(src)
return
/obj/structure/closet/secure_closet/personal/attackby(obj/item/W as obj, mob/user as mob)
code/game/objects/structures/crates_lockers/closets/secure/scientist.dm
+1 -2
View File
@@ -17,7 +17,6 @@
new /obj/item/device/radio/headset/headset_sci(src)
new /obj/item/weapon/tank/air(src)
new /obj/item/clothing/mask/gas(src)
new /obj/item/clothing/suit/toggle/wintercoat/science(src)
return
@@ -34,6 +33,7 @@
/obj/structure/closet/secure_closet/RD/New()
..()
new /obj/item/clothing/suit/toggle/wintercoat/science(src)
new /obj/item/clothing/suit/bio_suit/scientist(src)
new /obj/item/clothing/head/bio_hood/scientist(src)
new /obj/item/clothing/suit/toggle/labcoat(src)
@@ -49,5 +49,4 @@
new /obj/item/clothing/suit/armor/reactive(src)
new /obj/item/device/flash/handheld(src)
new /obj/item/device/laser_pointer(src)
new /obj/item/clothing/suit/toggle/wintercoat/science(src)
return
code/game/objects/structures/crates_lockers/closets/secure/security.dm
+3 -8
View File
@@ -10,6 +10,7 @@
/obj/structure/closet/secure_closet/captains/New()
..()
new /obj/item/clothing/suit/toggle/wintercoat/captain(src)
if(prob(50))
new /obj/item/weapon/storage/backpack/captain(src)
else
@@ -23,8 +24,6 @@
new /obj/item/clothing/shoes/sneakers/brown(src)
new /obj/item/device/radio/headset/heads/captain/alt(src)
new /obj/item/clothing/gloves/color/captain(src)
new /obj/item/clothing/suit/toggle/wintercoat/captain(src)
new /obj/item/clothing/head/santa(src)
new /obj/item/weapon/gun/energy/gun(src)
return
@@ -40,6 +39,7 @@
/obj/structure/closet/secure_closet/hop/New()
..()
new /obj/item/clothing/suit/toggle/wintercoat/cargo(src)
new /obj/item/clothing/under/rank/head_of_personnel(src)
new /obj/item/clothing/head/hopcap(src)
new /obj/item/weapon/cartridge/hop(src)
@@ -52,8 +52,6 @@
new /obj/item/device/flash/handheld(src)
new /obj/item/clothing/glasses/sunglasses(src)
new /obj/item/weapon/mining_voucher(src)
new /obj/item/clothing/suit/toggle/wintercoat/cargo(src)
new /obj/item/clothing/head/hardhat/reindeer()
return
@@ -70,6 +68,7 @@
/obj/structure/closet/secure_closet/hos/New()
..()
new /obj/item/clothing/suit/toggle/wintercoat/security(src)
new /obj/item/weapon/cartridge/hos(src)
new /obj/item/device/radio/headset/heads/hos(src)
new /obj/item/clothing/under/hosparadefem(src)
@@ -84,7 +83,6 @@
new /obj/item/weapon/melee/baton/loaded(src)
new /obj/item/weapon/gun/energy/gun/advtaser(src)
new /obj/item/weapon/storage/belt/security/full(src)
new /obj/item/clothing/suit/toggle/wintercoat/security(src)
return
@@ -114,7 +112,6 @@
new /obj/item/weapon/melee/baton/loaded(src)
new /obj/item/weapon/gun/energy/gun/advtaser(src)
new /obj/item/weapon/storage/belt/security/full(src)
new /obj/item/clothing/suit/toggle/wintercoat/security(src)
return
@@ -139,7 +136,6 @@
new /obj/item/weapon/grenade/flashbang(src)
new /obj/item/weapon/storage/belt/security/full(src)
new /obj/item/clothing/glasses/hud/security/sunglasses(src)
new /obj/item/clothing/suit/toggle/wintercoat/security(src)
return
@@ -209,7 +205,6 @@
new /obj/item/device/radio/headset/headset_sec/alt(src)
new /obj/item/device/detective_scanner(src)
new /obj/item/clothing/suit/armor/vest/det_suit(src)
new /obj/item/clothing/suit/toggle/wintercoat(src)
new /obj/item/ammo_box/c38(src)
new /obj/item/ammo_box/c38(src)
new /obj/item/weapon/gun/projectile/revolver/detective(src)
code/game/objects/structures/crates_lockers/closets/wardrobe.dm
+2 -8
View File
@@ -273,7 +273,6 @@
new /obj/item/clothing/gloves/fingerless(src)
new /obj/item/clothing/head/soft/black(src)
new /obj/item/clothing/head/soft/black(src)
new /obj/item/clothing/suit/toggle/wintercoat/science(src)
if(prob(40))
new /obj/item/clothing/mask/bandana/skull(src)
if(prob(40))
@@ -293,7 +292,6 @@
new /obj/item/clothing/shoes/sneakers/white(src)
new /obj/item/clothing/suit/toggle/labcoat/chemist(src)
new /obj/item/clothing/suit/toggle/labcoat/chemist(src)
new /obj/item/clothing/suit/toggle/wintercoat/medical(src)
return
@@ -309,7 +307,6 @@
new /obj/item/clothing/shoes/sneakers/white(src)
new /obj/item/clothing/suit/toggle/labcoat/genetics(src)
new /obj/item/clothing/suit/toggle/labcoat/genetics(src)
new /obj/item/clothing/suit/toggle/wintercoat/medical(src)
return
@@ -327,7 +324,6 @@
new /obj/item/clothing/suit/toggle/labcoat/virologist(src)
new /obj/item/clothing/mask/surgical(src)
new /obj/item/clothing/mask/surgical(src)
new /obj/item/clothing/suit/toggle/wintercoat/medical(src)
return
@@ -353,10 +349,9 @@
new /obj/item/clothing/under/assistantformal(src)
if(prob(40))
new /obj/item/clothing/under/assistantformal(src)
if(prob(50))
if(prob(30))
new /obj/item/clothing/suit/toggle/wintercoat(src)
new /obj/item/clothing/shoes/winterboots(src)
new /obj/item/clothing/head/santa(src)
return
@@ -394,8 +389,7 @@
new /obj/item/clothing/shoes/sneakers/black(src)
new /obj/item/clothing/shoes/sneakers/brown(src)
new /obj/item/clothing/shoes/sneakers/white(src)
if(prob(50))
if(prob(30))
new /obj/item/clothing/suit/toggle/wintercoat(src)
new /obj/item/clothing/shoes/winterboots(src)
new /obj/item/clothing/head/santa(src)
return