cyberpresidentvanellope/YWPolarisVore
1
0
Fork 0
mirror of https://github.com/Yawn-Wider/YWPolarisVore.git synced 2026-08-24 13:37:16 +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
2022-07-23 13:40:54 +02:00
parent 5988c05565 a6c022548f
commit 8f96195fdb
253 changed files with 7655 additions and 4653 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
+145 -132
View File
@@ -1,132 +1,145 @@
/obj/structure/closet/secure_closet/engineering_chief
name = "chief engineer's locker"
req_access = list(access_ce)
closet_appearance = /decl/closet_appearance/secure_closet/engineering/ce
starts_with = list(
/obj/item/clothing/accessory/storage/brown_vest,
/obj/item/blueprints,
///obj/item/clamp, //VOREStation Removal: without leaks those are pointless,
///obj/item/clamp, //VOREStation Removal: without leaks those are pointless,
/obj/item/clothing/under/rank/chief_engineer,
/obj/item/clothing/under/rank/chief_engineer/skirt,
/obj/item/clothing/head/hardhat/white,
///obj/item/clothing/head/welding, //VOREStation Removal: Locker bloat, grr. They get fancy goggles or can raid the welding supplies locker for one of these.
/obj/item/clothing/gloves/heavy_engineer, //VOREStation Edit: chief gets the good shit
/obj/item/clothing/shoes/brown,
/obj/item/weapon/cartridge/ce,
/obj/item/device/radio/headset/heads/ce,
/obj/item/device/radio/headset/heads/ce/alt,
/obj/item/weapon/storage/toolbox/mechanical,
/obj/item/clothing/suit/storage/hazardvest,
///obj/item/clothing/mask/gas, //VOREStation Removal: Locker bloat, grr. The fancy one below functions as a mask & helmet combined.
/obj/item/clothing/head/hardhat/firefighter/chief, //VOREStation Add: replaces the bog-standard gas mask
///obj/item/device/multitool, //VOREStation Removal: The belt they get, both standard and the fancy one, both come with one already, why stick another in here too?
/obj/item/weapon/storage/belt/utility/chief/full,
/obj/item/device/flash,
/obj/item/device/t_scanner/upgraded,
/obj/item/taperoll/engineering,
///obj/item/clothing/suit/storage/hooded/wintercoat/engineering, //VOREStation Removal: Locker bloat, grr. They can grab from the engi-clothes vendor if they want the standard one.
/obj/item/clothing/suit/storage/hooded/wintercoat/engineering/ce,
///obj/item/clothing/shoes/boots/winter/engineering, //VOREStation Removal: Locker bloat, grr. As above.
/obj/item/clothing/head/beret/engineering/ce,
/obj/item/clothing/head/beret/engineering/ce/white,
/obj/item/weapon/tank/emergency/oxygen/double, //VOREStation Edit: chief gets the good shit
/obj/item/weapon/reagent_containers/spray/windowsealant, //VOREStation Add,
/obj/item/weapon/pipe_dispenser) // YW Add
/obj/structure/closet/secure_closet/engineering_chief/Initialize()
if(prob(50))
starts_with += /obj/item/weapon/storage/backpack/industrial
else
starts_with += /obj/item/weapon/storage/backpack/satchel/eng
if(prob(50))
starts_with += /obj/item/weapon/storage/backpack/dufflebag/eng
return ..()
/obj/structure/closet/secure_closet/engineering_electrical
name = "electrical supplies"
req_access = list(access_engine_equip)
closet_appearance = /decl/closet_appearance/secure_closet/engineering/electrical
starts_with = list(
/obj/item/clothing/gloves/yellow = 2,
/obj/item/weapon/storage/toolbox/electrical = 3,
/obj/item/weapon/module/power_control = 3,
/obj/item/device/multitool = 3)
/obj/structure/closet/secure_closet/engineering_welding
name = "welding supplies"
req_access = list(access_construction)
closet_appearance = /decl/closet_appearance/secure_closet/engineering/welding
starts_with = list(
/obj/item/clothing/head/welding = 3,
/obj/item/weapon/weldingtool/largetank = 3,
/obj/item/weapon/weldpack = 3,
/obj/item/clothing/glasses/welding = 3)
/obj/structure/closet/secure_closet/engineering_personal
name = "engineer's locker"
req_access = list(access_engine_equip)
closet_appearance = /decl/closet_appearance/secure_closet/engineering
starts_with = list(
/obj/item/clothing/accessory/storage/brown_vest,
/obj/item/weapon/storage/toolbox/mechanical,
/obj/item/device/radio/headset/headset_eng,
/obj/item/device/radio/headset/headset_eng/alt,
/obj/item/clothing/suit/storage/hazardvest,
/obj/item/clothing/mask/gas,
/obj/item/clothing/glasses/meson,
/obj/item/weapon/cartridge/engineering,
/obj/item/taperoll/engineering,
/obj/item/clothing/head/hardhat,
/obj/item/clothing/suit/storage/hooded/wintercoat/engineering,
/obj/item/clothing/shoes/boots/winter/engineering,
/obj/item/weapon/tank/emergency/oxygen/engi,
/obj/item/weapon/storage/belt/utility, //VOREStation Add
/obj/item/weapon/reagent_containers/spray/windowsealant) //VOREStation Add
/obj/structure/closet/secure_closet/engineering_personal/Initialize()
if(prob(50))
starts_with += /obj/item/weapon/storage/backpack/industrial
else
starts_with += /obj/item/weapon/storage/backpack/satchel/eng
if(prob(50))
starts_with += /obj/item/weapon/storage/backpack/dufflebag/eng
return ..()
/obj/structure/closet/secure_closet/atmos_personal
name = "technician's locker"
req_access = list(access_atmospherics)
closet_appearance = /decl/closet_appearance/secure_closet/engineering/atmos
starts_with = list(
/obj/item/clothing/accessory/storage/brown_vest,
/obj/item/clothing/suit/fire/heavy,
/obj/item/clothing/head/hardhat/firefighter/atmos,
/obj/item/device/flashlight,
/obj/item/weapon/extinguisher/atmo,
///obj/item/clamp, //VOREStation Removal: without leaks those are pointless,
/obj/item/device/radio/headset/headset_eng,
/obj/item/device/radio/headset/headset_eng/alt,
/obj/item/clothing/suit/storage/hazardvest/atmos, //VOREStation edit. Eng locker gets regular haz-vest, atmos gets the themed one of their own
/obj/item/clothing/mask/gas,
/obj/item/weapon/cartridge/atmos,
/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/storage/belt/utility/atmostech) //VOREStation edit. They don't get a toolbox to fill it from, so why not give a spare one that's full already?
/obj/structure/closet/secure_closet/atmos_personal/Initialize()
if(prob(50))
starts_with += /obj/item/weapon/storage/backpack/industrial
else
starts_with += /obj/item/weapon/storage/backpack/satchel/eng
if(prob(50))
starts_with += /obj/item/weapon/storage/backpack/dufflebag/eng
return ..()
/obj/structure/closet/secure_closet/engineering_chief
name = "chief engineer's locker"
req_access = list(access_ce)
closet_appearance = /decl/closet_appearance/secure_closet/engineering/ce
starts_with = list(
/obj/item/clothing/accessory/storage/brown_vest,
/obj/item/blueprints,
///obj/item/clamp, //VOREStation Removal: without leaks those are pointless,
///obj/item/clamp, //VOREStation Removal: without leaks those are pointless,
/obj/item/clothing/under/rank/chief_engineer,
/obj/item/clothing/under/rank/chief_engineer/skirt,
/obj/item/clothing/head/hardhat/white,
///obj/item/clothing/head/welding, //VOREStation Removal: Locker bloat, grr. They get fancy goggles or can raid the welding supplies locker for one of these.
/obj/item/clothing/gloves/heavy_engineer, //VOREStation Edit: chief gets the good shit
/obj/item/clothing/shoes/brown,
/obj/item/weapon/cartridge/ce,
/obj/item/device/radio/headset/heads/ce,
/obj/item/device/radio/headset/heads/ce/alt,
/obj/item/weapon/storage/toolbox/mechanical,
/obj/item/clothing/suit/storage/hazardvest,
///obj/item/clothing/mask/gas, //VOREStation Removal: Locker bloat, grr. The fancy one below functions as a mask & helmet combined.
/obj/item/clothing/head/hardhat/firefighter/chief, //VOREStation Add: replaces the bog-standard gas mask
///obj/item/device/multitool, //VOREStation Removal: The belt they get, both standard and the fancy one, both come with one already, why stick another in here too?
/obj/item/weapon/storage/belt/utility/chief/full,
/obj/item/device/flash,
/obj/item/device/t_scanner/upgraded,
/obj/item/taperoll/engineering,
///obj/item/clothing/suit/storage/hooded/wintercoat/engineering, //VOREStation Removal: Locker bloat, grr. They can grab from the engi-clothes vendor if they want the standard one.
/obj/item/clothing/suit/storage/hooded/wintercoat/engineering/ce,
///obj/item/clothing/shoes/boots/winter/engineering, //VOREStation Removal: Locker bloat, grr. As above.
/obj/item/clothing/head/beret/engineering/ce,
/obj/item/clothing/head/beret/engineering/ce/white,
/obj/item/weapon/tank/emergency/oxygen/double, //VOREStation Edit: chief gets the good shit
/obj/item/weapon/reagent_containers/spray/windowsealant, //VOREStation Add,
/obj/item/weapon/pipe_dispenser) // YW Add
/obj/structure/closet/secure_closet/engineering_chief/Initialize()
if(prob(50))
starts_with += /obj/item/weapon/storage/backpack/industrial
else
starts_with += /obj/item/weapon/storage/backpack/satchel/eng
if(prob(50))
starts_with += /obj/item/weapon/storage/backpack/dufflebag/eng
return ..()
/obj/structure/closet/secure_closet/engineering_electrical
name = "electrical supplies"
req_access = list(access_engine_equip)
closet_appearance = /decl/closet_appearance/secure_closet/engineering/electrical
starts_with = list(
/obj/item/clothing/gloves/yellow = 2,
/obj/item/weapon/storage/toolbox/electrical = 3,
/obj/item/weapon/module/power_control = 3,
/obj/item/device/multitool = 3)
/obj/structure/closet/secure_closet/engineering_electrical/double
starts_with = list(
/obj/item/clothing/gloves/yellow = 4,
/obj/item/weapon/storage/toolbox/electrical = 6,
/obj/item/weapon/module/power_control = 6,
/obj/item/device/multitool = 6)
/obj/structure/closet/secure_closet/engineering_welding
name = "welding supplies"
req_access = list(access_construction)
closet_appearance = /decl/closet_appearance/secure_closet/engineering/welding
starts_with = list(
/obj/item/clothing/head/welding = 3,
/obj/item/weapon/weldingtool/largetank = 3,
/obj/item/weapon/weldpack = 3,
/obj/item/clothing/glasses/welding = 3)
/obj/structure/closet/secure_closet/engineering_welding/double
starts_with = list(
/obj/item/clothing/head/welding = 6,
/obj/item/weapon/weldingtool/largetank = 6,
/obj/item/weapon/weldpack = 6,
/obj/item/clothing/glasses/welding = 6)
/obj/structure/closet/secure_closet/engineering_personal
name = "engineer's locker"
req_access = list(access_engine_equip)
closet_appearance = /decl/closet_appearance/secure_closet/engineering
starts_with = list(
/obj/item/clothing/accessory/storage/brown_vest,
/obj/item/weapon/storage/toolbox/mechanical,
/obj/item/device/radio/headset/headset_eng,
/obj/item/device/radio/headset/headset_eng/alt,
/obj/item/clothing/suit/storage/hazardvest,
/obj/item/clothing/mask/gas,
/obj/item/clothing/glasses/meson,
/obj/item/weapon/cartridge/engineering,
/obj/item/taperoll/engineering,
/obj/item/clothing/head/hardhat,
/obj/item/clothing/suit/storage/hooded/wintercoat/engineering,
/obj/item/clothing/shoes/boots/winter/engineering,
/obj/item/weapon/tank/emergency/oxygen/engi,
/obj/item/weapon/storage/belt/utility, //VOREStation Add
/obj/item/weapon/reagent_containers/spray/windowsealant) //VOREStation Add
/obj/structure/closet/secure_closet/engineering_personal/Initialize()
if(prob(50))
starts_with += /obj/item/weapon/storage/backpack/industrial
else
starts_with += /obj/item/weapon/storage/backpack/satchel/eng
if(prob(50))
starts_with += /obj/item/weapon/storage/backpack/dufflebag/eng
return ..()
/obj/structure/closet/secure_closet/atmos_personal
name = "technician's locker"
req_access = list(access_atmospherics)
closet_appearance = /decl/closet_appearance/secure_closet/engineering/atmos
starts_with = list(
/obj/item/clothing/accessory/storage/brown_vest,
/obj/item/clothing/suit/fire/heavy,
/obj/item/clothing/head/hardhat/firefighter/atmos,
/obj/item/device/flashlight,
/obj/item/weapon/extinguisher/atmo,
///obj/item/clamp, //VOREStation Removal: without leaks those are pointless,
/obj/item/device/radio/headset/headset_eng,
/obj/item/device/radio/headset/headset_eng/alt,
/obj/item/clothing/suit/storage/hazardvest/atmos, //VOREStation edit. Eng locker gets regular haz-vest, atmos gets the themed one of their own
/obj/item/clothing/mask/gas,
/obj/item/weapon/cartridge/atmos,
/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/storage/belt/utility/atmostech) //VOREStation edit. They don't get a toolbox to fill it from, so why not give a spare one that's full already?
/obj/structure/closet/secure_closet/atmos_personal/Initialize()
if(prob(50))
starts_with += /obj/item/weapon/storage/backpack/industrial
else
starts_with += /obj/item/weapon/storage/backpack/satchel/eng
if(prob(50))
starts_with += /obj/item/weapon/storage/backpack/dufflebag/eng
return ..()
code/game/objects/structures/flora/flora.dm
+6 -6
View File
@@ -81,7 +81,7 @@
/obj/structure/flora/proc/spawn_harvest(var/path = null, var/mob/user = null)
if(!ispath(path))
return 0
var/atom/movable/AM = new path()
if(user)
user.put_in_hands(AM)
@@ -96,7 +96,7 @@
name = "bush"
icon = 'icons/obj/flora/snowflora.dmi'
icon_state = "snowbush1"
destroy_on_harvest = TRUE
harvest_tool = /obj/item/weapon/material/knife
randomize_harvest_count = FALSE
@@ -121,13 +121,13 @@
name = "bush"
icon = 'icons/obj/flora/ausflora.dmi'
icon_state = "firstbush_1"
destroy_on_harvest = TRUE
harvest_tool = /obj/item/weapon/material/knife
randomize_harvest_count = TRUE
harvest_loot = list(/obj/item/stack/material/fiber = 1)
min_harvests = 1
max_harvests = 3
max_harvests = 3
/obj/structure/flora/ausbushes/spawn_harvest(var/path = null, var/mob/user = null)
. = ..()
@@ -300,7 +300,7 @@
user.drop_from_inventory(I, src)
I.forceMove(src)
stored_item = I
src.visible_message("[bicon(src)] [bicon(I)] [user] places [I] into [src].")
src.visible_message("\icon[src][bicon(src)] \icon[I][bicon(I)] [user] places [I] into [src].")
return
else
to_chat(user, "<span class='notice'>You refrain from putting things into the plant pot.</span>")
@@ -311,7 +311,7 @@
to_chat(user, "<span class='filter_notice'><b>You see nothing of interest in [src]...</b></span>")
else
if(do_after(user, 10))
to_chat(user, "<span class='filter_notice'>You find [bicon(stored_item)] [stored_item] in [src]!</span>")
to_chat(user, "<span class='filter_notice'>You find \icon[stored_item][bicon(stored_item)] [stored_item] in [src]!</span>")
stored_item.forceMove(get_turf(src))
stored_item = null
..()
code/game/objects/structures/janicart.dm
+2 -2
View File
@@ -118,9 +118,9 @@ GLOBAL_LIST_BOILERPLATE(all_janitorial_carts, /obj/structure/janitorialcart)
. = ..(user)
if(istype(mybucket))
var/contains = mybucket.reagents.total_volume
. += "[bicon(src)] The bucket contains [contains] unit\s of liquid!"
. += "\icon[src][bicon(src)] The bucket contains [contains] unit\s of liquid!"
else
. += "[bicon(src)] There is no bucket mounted on it!"
. += "\icon[src][bicon(src)] There is no bucket mounted on it!"
/obj/structure/janitorialcart/MouseDrop_T(atom/movable/O as mob|obj, mob/living/user as mob)
if (istype(O, /obj/structure/mopbucket) && !mybucket)
code/game/objects/structures/map_blocker_vr.dm
+3
View File
@@ -8,8 +8,11 @@
opacity = 0
density = TRUE
unacidable = TRUE
plane = PLANE_BUILDMODE
/* //VOREStation Edit
/obj/effect/blocker/Initialize() // For non-gateway maps.
. = ..()
icon = null
icon_state = null
*/
code/game/objects/structures/signs_vr.dm
+7 -1
View File
@@ -2,4 +2,10 @@
icon = 'icons/obj/decals_vr.dmi'
name = "\improper ITG"
desc = "A polished metal sign which reads 'Ironcrest Transport Group'."
icon_state = "itg"
icon_state = "itg"
/obj/structure/sign/scenery/fakefireaxe
name = "decorative fire axe cabinet"
desc = "A fancy decorative indent in the wall, with an axe inside. The axe is actually a part of the indent and cannot be removed. A nostalgic reminder of older times of firefighting."
icon_state = "fireaxe1000"
icon = 'icons/obj/closet.dmi'
code/game/objects/structures/trash_pile_vr.dm
+2
View File
@@ -202,6 +202,8 @@
prob(2);/obj/item/toy/tennis/cyan,
prob(2);/obj/item/toy/tennis/blue,
prob(2);/obj/item/toy/tennis/purple,
prob(1);/obj/item/weapon/storage/box/brainzsnax,
prob(1);/obj/item/weapon/storage/box/brainzsnax/red,
prob(1);/obj/item/clothing/glasses/sunglasses,
prob(1);/obj/item/clothing/glasses/sunglasses/bigshot,
prob(1);/obj/item/clothing/glasses/welding,