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

Merge pull request #7346 from paprka/hoodshit

Browse Source 
New hood/hardsuit helmet system
This commit is contained in:
Swag McYolosteinen
2015-01-29 18:57:25 +01:00
parent 30d62a89a8 38e038a0d8
commit 3bb7213d14
25 changed files with 223 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items.dm
+1
View File
@@ -46,6 +46,7 @@
var/suittoggled = 0
var/hooded = 0
var/list/can_be_placed_into = list(
/obj/structure/table,
/obj/structure/rack,
code/game/objects/items/weapons/storage/uplink_kits.dm
+1 -1
View File
@@ -84,7 +84,7 @@
new /obj/item/weapon/melee/energy/sword/saber(src)
new /obj/item/weapon/melee/energy/sword/saber(src)
new /obj/item/weapon/dnainjector/telemut/darkbundle(src)
new /obj/item/clothing/suit/toggle/chaplain_hoodie(src)
new /obj/item/clothing/suit/hooded/chaplain_hoodie(src)
new /obj/item/weapon/card/id/syndicate(src)
return
code/game/objects/structures/crates_lockers/closets/secure/cargo.dm
+1 -1
View File
@@ -30,7 +30,7 @@
/obj/structure/closet/secure_closet/quartermaster/New()
..()
new /obj/item/clothing/suit/toggle/wintercoat/cargo(src)
new /obj/item/clothing/suit/hooded/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)
code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
+2 -2
View File
@@ -11,8 +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)
new /obj/item/clothing/suit/hooded/wintercoat/engineering(src)
new /obj/item/clothing/suit/hooded/wintercoat/engineering/atmos(src)
if(prob(50))
new /obj/item/weapon/storage/backpack/industrial(src)
else
code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm
+1 -1
View File
@@ -11,7 +11,7 @@
New()
..()
new /obj/item/clothing/suit/toggle/wintercoat/hydro(src)
new /obj/item/clothing/suit/hooded/wintercoat/hydro(src)
switch(rand(1,2))
if(1)
new /obj/item/clothing/suit/apron(src)
code/game/objects/structures/crates_lockers/closets/secure/medical.dm
+1 -1
View File
@@ -97,7 +97,7 @@
/obj/structure/closet/secure_closet/CMO/New()
..()
new /obj/item/clothing/suit/toggle/wintercoat/medical(src)
new /obj/item/clothing/suit/hooded/wintercoat/medical(src)
if(prob(50))
new /obj/item/weapon/storage/backpack/medic(src)
else
code/game/objects/structures/crates_lockers/closets/secure/scientist.dm
+1 -1
View File
@@ -33,7 +33,7 @@
/obj/structure/closet/secure_closet/RD/New()
..()
new /obj/item/clothing/suit/toggle/wintercoat/science(src)
new /obj/item/clothing/suit/hooded/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)
code/game/objects/structures/crates_lockers/closets/secure/security.dm
+3 -3
View File
@@ -10,7 +10,7 @@
/obj/structure/closet/secure_closet/captains/New()
..()
new /obj/item/clothing/suit/toggle/wintercoat/captain(src)
new /obj/item/clothing/suit/hooded/wintercoat/captain(src)
if(prob(50))
new /obj/item/weapon/storage/backpack/captain(src)
else
@@ -40,7 +40,7 @@
/obj/structure/closet/secure_closet/hop/New()
..()
new /obj/item/clothing/suit/toggle/wintercoat/cargo(src)
new /obj/item/clothing/suit/hooded/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)
@@ -69,7 +69,7 @@
/obj/structure/closet/secure_closet/hos/New()
..()
new /obj/item/clothing/suit/toggle/wintercoat/security(src)
new /obj/item/clothing/suit/hooded/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)
code/game/objects/structures/crates_lockers/closets/wardrobe.dm
+3 -3
View File
@@ -95,7 +95,7 @@
new /obj/item/clothing/shoes/sneakers/black(src)
new /obj/item/clothing/suit/nun(src)
new /obj/item/clothing/head/nun_hood(src)
new /obj/item/clothing/suit/toggle/chaplain_hoodie(src)
new /obj/item/clothing/suit/hooded/chaplain_hoodie(src)
new /obj/item/clothing/suit/holidaypriest(src)
new /obj/item/weapon/storage/backpack/cultpack (src)
new /obj/item/weapon/storage/fancy/candle_box(src)
@@ -354,7 +354,7 @@
if(prob(40))
new /obj/item/clothing/under/assistantformal(src)
if(prob(30))
new /obj/item/clothing/suit/toggle/wintercoat(src)
new /obj/item/clothing/suit/hooded/wintercoat(src)
new /obj/item/clothing/shoes/winterboots(src)
return
@@ -394,6 +394,6 @@
new /obj/item/clothing/shoes/sneakers/brown(src)
new /obj/item/clothing/shoes/sneakers/white(src)
if(prob(30))
new /obj/item/clothing/suit/toggle/wintercoat(src)
new /obj/item/clothing/suit/hooded/wintercoat(src)
new /obj/item/clothing/shoes/winterboots(src)
return