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

Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac

Browse Source
This commit is contained in:
izac112
2020-08-22 20:07:45 +02:00
parent 8c55d1cc3f 38f6ff2404
commit 48af4c881c
339 changed files with 12177 additions and 5535 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/crates_lockers/closets/job_closets.dm
+1 -1
View File
@@ -64,7 +64,7 @@
/obj/item/clothing/head/soft/purple,
/obj/item/clothing/head/beret/purple,
/obj/item/device/flashlight,
/obj/item/weapon/caution = 4,
/obj/item/clothing/suit/caution = 4,
/obj/item/device/lightreplacer,
/obj/item/weapon/storage/bag/trash,
/obj/item/weapon/storage/belt/janitor,
code/game/objects/structures/crates_lockers/crates.dm
+4 -4
View File
@@ -407,8 +407,8 @@
desc = "A crate emblazoned with the NanoThreads Garments livery, a subsidary of the NanoTrasen Corporation."
closet_appearance = /decl/closet_appearance/crate/nanotrasenclothing
/obj/structure/closet/crate/nanocare
desc = "A crate emblazoned with the NanoCare Medical livery, a subsidary of the NanoTrasen Corporation."
/obj/structure/closet/crate/nanomed
desc = "A crate emblazoned with the NanoMed Medical livery, a subsidary of the NanoTrasen Corporation."
closet_appearance = /decl/closet_appearance/crate/nanotrasenmedical
/obj/structure/closet/crate/oculum
@@ -522,8 +522,8 @@
desc = "A secure crate emblazoned with the standard NanoTrasen livery."
closet_appearance = /decl/closet_appearance/crate/secure/nanotrasen
/obj/structure/closet/crate/secure/nanocare
desc = "A secure crate emblazoned with the NanoCare Medical livery, a subsidary of the NanoTrasen Corporation."
/obj/structure/closet/crate/secure/nanomed
desc = "A secure crate emblazoned with the NanoMed Medical livery, a subsidary of the NanoTrasen Corporation."
closet_appearance = /decl/closet_appearance/crate/secure/nanotrasenmedical
/obj/structure/closet/crate/secure/scg
code/game/objects/structures/janicart.dm
+3 -3
View File
@@ -93,7 +93,7 @@ GLOBAL_LIST_BOILERPLATE(all_janitorial_carts, /obj/structure/janitorialcart)
to_chat(user, "<span class='notice'>You put [I] into [src].</span>")
return 1
else if(istype(I, /obj/item/weapon/caution))
else if(istype(I, /obj/item/clothing/suit/caution))
if(signs < 4)
user.unEquip(I, 0, src)
signs++
@@ -192,7 +192,7 @@ GLOBAL_LIST_BOILERPLATE(all_janitorial_carts, /obj/structure/janitorialcart)
myreplacer = null
if("sign")
if(signs)
var/obj/item/weapon/caution/Sign = locate() in src
var/obj/item/clothing/suit/caution/Sign = locate() in src
if(Sign)
user.put_in_hands(Sign)
to_chat(user, "<span class='notice'>You take \a [Sign] from [src].</span>")
@@ -258,7 +258,7 @@ GLOBAL_LIST_BOILERPLATE(all_janitorial_carts, /obj/structure/janitorialcart)
mybucket = null
if (signs)
for (var/obj/item/weapon/caution/Sign in src)
for (var/obj/item/clothing/suit/caution/Sign in src)
if (prob(min((chance*2),100)))
signs--
Sign.forceMove(dropspot)
code/game/objects/structures/loot_piles.dm
+5 -2
View File
@@ -192,8 +192,8 @@ Loot piles can be depleted, if loot_depleted is turned on. Note that players wh
/obj/item/weapon/spacecash/c10,
/obj/item/weapon/spacecash/c20,
/obj/item/weapon/camera_assembly,
/obj/item/weapon/caution,
/obj/item/weapon/caution/cone,
/obj/item/clothing/suit/caution,
/obj/item/clothing/head/cone,
/obj/item/weapon/card/emag_broken,
/obj/item/device/camera,
/obj/item/device/pda,
@@ -227,8 +227,10 @@ Loot piles can be depleted, if loot_depleted is turned on. Note that players wh
/obj/item/trash/candle,
/obj/item/trash/candy,
/obj/item/trash/candy/proteinbar,
/obj/item/trash/candy/gums,
/obj/item/trash/cheesie,
/obj/item/trash/chips,
/obj/item/trash/chips/bbq,
/obj/item/trash/liquidfood,
/obj/item/trash/pistachios,
/obj/item/trash/plate,
@@ -239,6 +241,7 @@ Loot piles can be depleted, if loot_depleted is turned on. Note that players wh
/obj/item/trash/sosjerky,
/obj/item/trash/syndi_cakes,
/obj/item/trash/tastybread,
/obj/item/trash/coffee,
/obj/item/trash/tray,
/obj/item/trash/unajerky,
/obj/item/trash/waffles,
code/game/objects/structures/trash_pile_vr.dm
+2 -2
View File
@@ -141,7 +141,7 @@
prob(4);/obj/item/clothing/shoes/leather,
prob(4);/obj/item/clothing/suit/storage/hazardvest,
prob(4);/obj/item/clothing/under/color/grey,
prob(4);/obj/item/weapon/caution,
prob(4);/obj/item/clothing/suit/caution,
prob(4);/obj/item/weapon/cell,
prob(4);/obj/item/weapon/cell/device,
prob(4);/obj/item/weapon/reagent_containers/food/snacks/liquidfood,
@@ -165,7 +165,7 @@
prob(3);/obj/item/device/radio/headset,
prob(3);/obj/item/seeds/lustflower,
prob(3);/obj/item/weapon/camera_assembly,
prob(3);/obj/item/weapon/caution/cone,
prob(3);/obj/item/clothing/head/cone,
prob(3);/obj/item/weapon/cell/high,
prob(3);/obj/item/weapon/spacecash/c10,
prob(3);/obj/item/weapon/spacecash/c20,