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

Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into MyUpstreamMerge

Browse Source
This commit is contained in:
Erik
2020-02-13 20:36:32 -08:00
parent 335745d4b7 0990e92def
commit 11268a3ff4
254 changed files with 65558 additions and 229875 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/crates_lockers/closets/secure/closets_yw.dm
+2 -1
View File
@@ -21,12 +21,13 @@
/obj/item/weapon/melee/baton/loaded,
/obj/item/clothing/glasses/sunglasses,
/obj/item/clothing/glasses/sunglasses/medhud,
/obj/item/clothing/head/beret/centcom/officer,
/obj/item/clothing/head/beret/blueshield,
/obj/item/clothing/head/helmet/dermal,
/obj/item/clothing/under/yw/blueshield,
/obj/item/clothing/under/yw/blueshield2,
/obj/item/clothing/suit/armor/yw/blueshield,
/obj/item/clothing/suit/armor/yw/blueshieldcoat,
/obj/item/clothing/accessory/poncho/roles/cloak/blueshield,
/obj/item/clothing/shoes/laceup,
/obj/item/clothing/accessory/holster/leg,
/obj/item/clothing/shoes/boots/jackboots,
code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
+1 -2
View File
@@ -139,8 +139,7 @@
/obj/item/taperoll/atmos,
/obj/item/clothing/suit/storage/hooded/wintercoat/engineering/atmos,
/obj/item/clothing/shoes/boots/winter/atmos,
/obj/item/weapon/tank/emergency/oxygen/engi,
/obj/item/weapon/pipe_dispenser) //YW Addition
/obj/item/weapon/tank/emergency/oxygen/engi) //removed RPD from lockers. Now starts on desk in map. YW edit
/obj/structure/closet/secure_closet/atmos_personal/Initialize()
if(prob(50))
code/game/objects/structures/curtains.dm
+1
View File
@@ -1,5 +1,6 @@
/obj/structure/curtain
name = "curtain"
desc = "The show must go on! At least, until you close these."
icon = 'icons/obj/curtain.dmi'
icon_state = "closed"
plane = MOB_PLANE
code/game/objects/structures/trash_pile.dm
+1 -2
View File
@@ -245,8 +245,7 @@
prob(1);/obj/item/weapon/material/knife/tacknife,
prob(1);/obj/item/weapon/storage/box/survival/space,
prob(1);/obj/item/weapon/storage/secure/briefcase/trashmoney,
prob(1);/obj/item/weapon/reagent_containers/syringe/steroid,
prob(1);/obj/item/seeds/gnomes)
prob(1);/obj/item/weapon/reagent_containers/syringe/steroid)
var/obj/item/I = new path()
return I