cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-29 16:19:36 +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-09-13 15:05:53 +02:00
parent 454bcc02d6 a4f6d03944
commit 4b051c23fc
969 changed files with 169510 additions and 210533 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/bedsheet_bin.dm
+2 -1
View File
@@ -16,7 +16,8 @@ LINEN BINS
throw_speed = 1
throw_range = 2
w_class = ITEMSIZE_SMALL
drop_sound = 'sound/items/drop/clothing.ogg'
drop_sound = 'sound/items/drop/cloth.ogg'
pickup_sound = 'sound/items/pickup/cloth.ogg'
/obj/item/weapon/bedsheet/attack_self(mob/user as mob)
user.drop_item()
code/game/objects/structures/crates_lockers/closets/misc_vr.dm
+2
View File
@@ -44,6 +44,7 @@
/obj/item/clothing/under/explorer,
/obj/item/clothing/suit/storage/hooded/explorer,
/obj/item/clothing/mask/gas/explorer,
/obj/item/weapon/storage/belt/explorer,
/obj/item/clothing/shoes/boots/winter/explorer,
/obj/item/clothing/gloves/black,
/obj/item/device/radio/headset/explorer,
@@ -159,6 +160,7 @@
/obj/item/clothing/under/explorer,
/obj/item/clothing/suit/storage/hooded/explorer,
/obj/item/clothing/mask/gas/explorer,
/obj/item/weapon/storage/belt/explorer/pathfinder,
/obj/item/clothing/shoes/boots/winter/explorer,
/obj/item/clothing/gloves/black,
/obj/item/device/radio/headset/pathfinder,
code/game/objects/structures/crates_lockers/closets/secure/scientist.dm
+1 -1
View File
@@ -35,7 +35,7 @@
/obj/item/clothing/suit/storage/toggle/labcoat,
/obj/item/weapon/cartridge/rd,
/obj/item/clothing/shoes/white,
/obj/item/clothing/shoes/leather,
/obj/item/clothing/shoes/laceup/brown,
/obj/item/clothing/gloves/sterile/latex,
/obj/item/device/radio/headset/heads/rd,
/obj/item/device/radio/headset/heads/rd/alt,
code/game/objects/structures/crates_lockers/closets/secure/security.dm
+3 -2
View File
@@ -1,5 +1,5 @@
/obj/structure/closet/secure_closet/captains
name = "colony director's locker"
name = "site manager's locker"
req_access = list(access_captain)
closet_appearance = /decl/closet_appearance/secure_closet/command
@@ -53,7 +53,8 @@
/obj/item/clothing/under/lawyer/oldman,
/obj/item/clothing/shoes/brown,
/obj/item/clothing/shoes/black,
/obj/item/clothing/shoes/leather,
/obj/item/clothing/shoes/laceup,
/obj/item/clothing/shoes/laceup/brown,
/obj/item/clothing/shoes/white,
/obj/item/clothing/under/rank/head_of_personnel_whimsy,
/obj/item/clothing/head/caphat/hop,
code/game/objects/structures/crates_lockers/closets/wardrobe.dm
+2 -2
View File
@@ -361,7 +361,7 @@
/obj/item/clothing/shoes/green,
/obj/item/clothing/shoes/purple,
/obj/item/clothing/shoes/red,
/obj/item/clothing/shoes/leather,
/obj/item/clothing/shoes/laceup/brown,
/obj/item/clothing/under/pants/classicjeans,
/obj/item/clothing/under/pants/mustangjeans,
/obj/item/clothing/under/pants/blackjeans,
@@ -451,7 +451,7 @@
/obj/item/weapon/storage/backpack/satchel = 2)
/obj/structure/closet/wardrobe/captain
name = "colony director's wardrobe"
name = "site manager's wardrobe"
closet_appearance = /decl/closet_appearance/cabinet
starts_with = list(
code/game/objects/structures/crates_lockers/largecrate_vr.dm
+1
View File
@@ -53,6 +53,7 @@
/mob/living/simple_mob/vore/aggressive/mimic,
/mob/living/simple_mob/vore/aggressive/rat,
/mob/living/simple_mob/vore/aggressive/rat/tame,
/mob/living/simple_mob/vore/rabbit,
// /mob/living/simple_mob/otie;0.5
))
return ..()
code/game/objects/structures/flora/flora.dm
+3
View File
@@ -233,6 +233,9 @@
. += "<span class='filter_notice'><i>You can see something in there...</i></span>"
/obj/structure/flora/pottedplant/attackby(obj/item/I, mob/user)
if(issilicon(user))
return // Don't try to put modules in here, you're a borg. TODO: Inventory refactor to not be ass.
if(stored_item)
to_chat(user, "<span class='notice'>[I] won't fit in. There already appears to be something in here...</span>")
return
code/game/objects/structures/loot_piles.dm
+2 -2
View File
@@ -156,8 +156,8 @@ Loot piles can be depleted, if loot_depleted is turned on. Note that players wh
/obj/item/clothing/shoes/galoshes,
/obj/item/clothing/shoes/black,
/obj/item/clothing/shoes/laceup,
/obj/item/clothing/shoes/black,
/obj/item/clothing/shoes/leather,
/obj/item/clothing/shoes/laceup/grey,
/obj/item/clothing/shoes/laceup/brown,
/obj/item/clothing/gloves/botanic_leather,
/obj/item/clothing/gloves/sterile/latex,
/obj/item/clothing/gloves/white,
code/game/objects/structures/stool_bed_chair_nest/bed.dm
+2
View File
@@ -236,6 +236,8 @@
w_class = ITEMSIZE_LARGE
var/rollertype = /obj/item/roller
var/bedtype = /obj/structure/bed/roller
drop_sound = 'sound/items/drop/axe.ogg'
pickup_sound = 'sound/items/pickup/axe.ogg'
/obj/item/roller/attack_self(mob/user)
var/obj/structure/bed/roller/R = new bedtype(user.loc)
code/game/objects/structures/trash_pile_vr.dm
+1 -1
View File
@@ -138,7 +138,7 @@
prob(4);/obj/item/clothing/shoes/black,
prob(4);/obj/item/clothing/shoes/black,
prob(4);/obj/item/clothing/shoes/laceup,
prob(4);/obj/item/clothing/shoes/leather,
prob(4);/obj/item/clothing/shoes/laceup/brown,
prob(4);/obj/item/clothing/suit/storage/hazardvest,
prob(4);/obj/item/clothing/under/color/grey,
prob(4);/obj/item/clothing/suit/caution,