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

Merge branch 'virgoMaster' into virgoPull

Browse Source
This commit is contained in:
Reddeyfish
2018-05-19 17:16:17 -07:00
parent bba89888bf 622a0dd1fa
commit 813d7bf643
203 changed files with 11021 additions and 7365 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/crates_lockers/closets/l3closet_vr.dm
-27
View File
@@ -1,27 +0,0 @@
/obj/structure/closet/l3closet/virology/New()
..()
new /obj/item/clothing/suit/bio_suit/virology/taur(src)
new /obj/item/clothing/head/bio_hood/virology(src)
new /obj/item/clothing/mask/gas(src)
new /obj/item/weapon/tank/oxygen(src)
/obj/structure/closet/l3closet/security/New()
..()
new /obj/item/clothing/suit/bio_suit/security/taur(src)
new /obj/item/clothing/head/bio_hood/security(src)
/obj/structure/closet/l3closet/janitor/New()
..()
new /obj/item/clothing/suit/bio_suit/janitor/taur(src)
new /obj/item/clothing/head/bio_hood/janitor(src)
new /obj/item/clothing/mask/gas(src)
new /obj/item/weapon/tank/emergency/oxygen/engi(src)
/obj/structure/closet/l3closet/scientist/New()
..()
new /obj/item/clothing/suit/bio_suit/scientist/taur(src)
new /obj/item/clothing/head/bio_hood/scientist(src)
code/game/objects/structures/crates_lockers/closets/secure/medical.dm
+2
View File
@@ -313,6 +313,8 @@
icon_opened = "medical_wall_open"
icon_broken = "medical_wall_spark"
icon_off = "medical_wall_off"
plane = TURF_PLANE
layer = ABOVE_TURF_LAYER
anchored = 1
density = 0
wall_mounted = 1
code/game/objects/structures/crates_lockers/closets/utility_closets.dm
+2
View File
@@ -215,6 +215,8 @@
icon_state = "hydrant"
icon_closed = "hydrant"
icon_opened = "hydrant_open"
plane = TURF_PLANE
layer = ABOVE_TURF_LAYER
anchored = 1
density = 0
wall_mounted = 1
code/game/objects/structures/crates_lockers/closets/utility_closets_vr.dm
-3
View File
@@ -1,13 +1,11 @@
/obj/structure/closet/radiation/New()
..()
new /obj/item/clothing/suit/radiation/taur(src)
new /obj/item/clothing/head/radiation(src)
new /obj/item/device/geiger(src)
/obj/structure/closet/bombcloset/New()
..()
new /obj/item/clothing/suit/bomb_suit/taur(src)
new /obj/item/clothing/under/color/black(src)
new /obj/item/clothing/shoes/black(src )
new /obj/item/clothing/head/bomb_hood(src)
@@ -15,7 +13,6 @@
/obj/structure/closet/bombclosetsecurity/New()
..()
new /obj/item/clothing/suit/bomb_suit/taur/security(src)
new /obj/item/clothing/under/rank/security(src)
new /obj/item/clothing/shoes/brown(src)
new /obj/item/clothing/head/bomb_hood/security(src)
code/game/objects/structures/crates_lockers/largecrate_vr.dm
+3 -3
View File
@@ -48,13 +48,13 @@
/mob/living/simple_animal/hostile/frog,
/mob/living/simple_animal/horse,
/mob/living/simple_animal/hostile/panther,
/mob/living/simple_animal/hostile/snake,
/mob/living/simple_animal/hostile/giant_snake,
/mob/living/simple_animal/hostile/wolf,
/mob/living/simple_animal/hostile/bear;0.5,
/mob/living/simple_animal/hostile/bear/brown;0.5,
/mob/living/simple_animal/hostile/carp,
/mob/living/simple_animal/hostile/mimic,
/mob/living/simple_animal/hostile/rous,
/mob/living/simple_animal/hostile/rat,
/mob/living/simple_animal/otie;0.5)
..()
@@ -73,7 +73,7 @@
/mob/living/simple_animal/hostile/alien/sentinel,
/mob/living/simple_animal/hostile/alien/queen,
/mob/living/simple_animal/otie/feral,
/mob/living/simple_animal/hostile/badboi)
/mob/living/simple_animal/hostile/corrupthound)
..()
/obj/structure/largecrate/animal/guardbeast
code/game/objects/structures/curtains.dm
+8 -7
View File
@@ -2,13 +2,15 @@
name = "curtain"
icon = 'icons/obj/curtain.dmi'
icon_state = "closed"
layer = SHOWER_OPEN_LAYER
plane = MOB_PLANE
layer = ABOVE_MOB_LAYER
opacity = 1
density = 0
/obj/structure/curtain/open
icon_state = "open"
layer = SHOWER_CLOSED_LAYER
plane = OBJ_PLANE
layer = OBJ_LAYER
opacity = 0
/obj/structure/curtain/bullet_act(obj/item/projectile/P, def_zone)
@@ -27,10 +29,12 @@
set_opacity(!opacity)
if(opacity)
icon_state = "closed"
layer = SHOWER_CLOSED_LAYER
plane = MOB_PLANE
layer = ABOVE_MOB_LAYER
else
icon_state = "open"
layer = SHOWER_OPEN_LAYER
plane = OBJ_PLANE
layer = OBJ_LAYER
/obj/structure/curtain/attackby(obj/item/P, mob/user)
if(istype(P, /obj/item/weapon/wirecutters))
@@ -76,6 +80,3 @@
/obj/structure/curtain/open/shower/security
color = "#AA0000"
#undef SHOWER_OPEN_LAYER
#undef SHOWER_CLOSED_LAYER
code/game/objects/structures/extinguisher.dm
+2
View File
@@ -3,6 +3,8 @@
desc = "A small wall mounted cabinet designed to hold a fire extinguisher."
icon = 'icons/obj/closet.dmi'
icon_state = "extinguisher_closed"
plane = TURF_PLANE
layer = ABOVE_TURF_LAYER
anchored = 1
density = 0
var/obj/item/weapon/extinguisher/has_extinguisher
code/game/objects/structures/loot_piles.dm
+39
View File
@@ -830,3 +830,42 @@ Loot piles can be depleted, if loot_depleted is turned on. Note that players wh
/obj/item/mecha_parts/mecha_equipment/repair_droid,
/obj/item/mecha_parts/mecha_equipment/teleporter
)
/obj/structure/loot_pile/surface/drone
name = "drone wreckage"
desc = "The ruins of some unfortunate drone. Perhaps something is salvageable."
icon = 'icons/mob/animal.dmi'
icon_state = "drone_dead"
// Since the actual drone loot is a bit stupid in how it is handled, this is a sparse and empty list with items I don't exactly want in it. But until we can get the proper items in . . .
common_loot = list(
/obj/random/tool,
/obj/item/stack/cable_coil/random,
/obj/random/tank,
/obj/random/tech_supply/component,
/obj/item/stack/material/steel{amount = 25},
/obj/item/stack/material/glass{amount = 10},
/obj/item/stack/material/plasteel{amount = 5},
/obj/item/weapon/cell,
/obj/item/weapon/material/shard
)
uncommon_loot = list(
/obj/item/weapon/cell/high,
/obj/item/robot_parts/robot_component/actuator,
/obj/item/robot_parts/robot_component/armour,
/obj/item/robot_parts/robot_component/binary_communication_device,
/obj/item/robot_parts/robot_component/camera,
/obj/item/robot_parts/robot_component/diagnosis_unit,
/obj/item/robot_parts/robot_component/radio
)
rare_loot = list(
/obj/item/weapon/cell/super,
/obj/item/borg/upgrade/restart,
/obj/item/borg/upgrade/jetpack,
/obj/item/borg/upgrade/tasercooler,
/obj/item/borg/upgrade/syndicate,
/obj/item/borg/upgrade/vtec
)
code/game/objects/structures/signs.dm
+14 -1
View File
@@ -3,7 +3,8 @@
anchored = 1
opacity = 0
density = 0
layer = ABOVE_JUNK_LAYER
plane = TURF_PLANE
layer = ABOVE_TURF_LAYER
w_class = ITEMSIZE_NORMAL
/obj/structure/sign/ex_act(severity)
@@ -387,6 +388,18 @@
icon = 'icons/obj/christmas.dmi'
icon_state = "doorwreath"
/obj/structure/sign/hostilefauna
icon = 'icons/obj/decals_vr.dmi'
name = "\improper Caution: Hostile fauna"
desc = "This sign warns of hostile life forms in the area."
icon_state = "h_fauna"
/obj/structure/sign/graffiti/pisoff
icon = 'icons/obj/decals_vr.dmi'
name = "\improper PIS OFF"
desc = "This sign bears some rather rude looking graffiti instructing you to PIS OFF."
icon_state = "pisoff"
//Eris signs
/obj/structure/sign/ironhammer
code/game/objects/structures/watercloset.dm
+2 -1
View File
@@ -142,7 +142,8 @@
name = "mist"
icon = 'icons/obj/watercloset.dmi'
icon_state = "mist"
layer = MOB_LAYER + 1
plane = MOB_PLANE
layer = ABOVE_MOB_LAYER
anchored = 1
mouse_opacity = 0