cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into master

Browse Source
This commit is contained in:
RadiantFlash7
2020-08-09 22:33:07 -04:00
committed by GitHub
parent 5f23892bed 9d3b96c8bd
commit c4dad2dce6
13 changed files with 983 additions and 508 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/game/objects/items/weapons/material/chainsaw.dm
View File

@@ -12,13 +12,13 @@ obj/item/weapon/chainsaw
var/active_force = 55
var/inactive_force = 10
obj/item/weapon/chainsaw/New()
obj/item/weapon/chainsaw/Initialize() //YW edit - replaced New with Initialize so chainsaws can be mapped in
. = ..()
var/datum/reagents/R = new/datum/reagents(max_fuel)
reagents = R
R.my_atom = src
R.add_reagent("fuel", max_fuel)
START_PROCESSING(SSobj, src)
..()
obj/item/weapon/chainsaw/Destroy()
STOP_PROCESSING(SSobj, src)

5
code/modules/client/preference_setup/loadout/loadout_xeno_yw.dm
View File

@@ -212,3 +212,8 @@
var/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/cloak_type = cloak
cloaks[initial(cloak_type.name)] = cloak_type
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks))
/datum/gear/uniform/harness_white
display_name = "white gear harness (Full Body Prosthetic, Diona)"
path = /obj/item/clothing/under/harness_white
sort_category = "Xenowear"

8
code/modules/events/event_container_vr.dm
View File

@@ -49,9 +49,10 @@
new /datum/event_meta(EVENT_LEVEL_MUNDANE, "Vermin Infestation",/datum/event/infestation, 100, list(ASSIGNMENT_JANITOR = 100), 1),
// Rot only weakens walls, not destroy them
new /datum/event_meta(EVENT_LEVEL_MUNDANE, "Wallrot", /datum/event/wallrot, 0, list(ASSIGNMENT_ENGINEER = 30, ASSIGNMENT_GARDENER = 50), 1),
new /datum/event_meta(EVENT_LEVEL_MUNDANE, "Aurora Caelus", /datum/event/aurora_caelus, 2, list(), 1),
//new /datum/event_meta(EVENT_LEVEL_MUNDANE, "Aurora Caelus", /datum/event/aurora_caelus, 2, list(), 1), YW EDIT
)
add_disabled_events(list(
new /datum/event_meta(EVENT_LEVEL_MUNDANE, "Aurora Caelus", /datum/event/aurora_caelus, 2, list(), 1), //YW EDIT
new /datum/event_meta(EVENT_LEVEL_MUNDANE, "Ian Storm", /datum/event/ianstorm, 1, list(), 1),
new /datum/event_meta(EVENT_LEVEL_MUNDANE, "Lost Carp", /datum/event/carp_migration, 0, list(ASSIGNMENT_SECURITY = 10), 1),
new /datum/event_meta(EVENT_LEVEL_MUNDANE, "Supply Demand", /datum/event/supply_demand, 0, list(ASSIGNMENT_ANY = 5, ASSIGNMENT_SCIENCE = 15, ASSIGNMENT_GARDENER = 10, ASSIGNMENT_ENGINEER = 10, ASSIGNMENT_MEDICAL = 15), 1),
@@ -84,13 +85,14 @@
new /datum/event_meta(EVENT_LEVEL_MODERATE, "Radiation Storm", /datum/event/radiation_storm, 50, list(ASSIGNMENT_MEDICAL = 50), 1), //YW EDIT, Readded
new /datum/event_meta(EVENT_LEVEL_MODERATE, "Maintenance Predator", /datum/event/maintenance_predator, 75, list(ASSIGNMENT_SECURITY = 25, ASSIGNMENT_SCIENTIST = 10), 1),
new /datum/event_meta(EVENT_LEVEL_MODERATE, "Appendicitis", /datum/event/spontaneous_appendicitis, 0, list(ASSIGNMENT_MEDICAL = 30), 1), //YW EDIT, Readded
new /datum/event_meta(EVENT_LEVEL_MODERATE, "Morph Spawn", /datum/event/morph_spawn, 75, list(ASSIGNMENT_SECURITY = 35), 1)
new /datum/event_meta(EVENT_LEVEL_MODERATE, "Morph Spawn", /datum/event/morph_spawn, 75, list(ASSIGNMENT_SECURITY = 35), 1),
new /datum/event_meta(EVENT_LEVEL_MODERATE, "Supply Demand", /datum/event/supply_demand, 0, list(ASSIGNMENT_ANY = 5, ASSIGNMENT_SCIENCE = 15, ASSIGNMENT_GARDENER = 10, ASSIGNMENT_ENGINEER = 10, ASSIGNMENT_MEDICAL = 15), 3), //YW EDIT, Readded
)
add_disabled_events(list(
new /datum/event_meta(EVENT_LEVEL_MODERATE, "Meteor Shower", /datum/event/meteor_wave, 30, list(ASSIGNMENT_ENGINEER = 20)),
new /datum/event_meta(EVENT_LEVEL_MODERATE, "Random Antagonist", /datum/event/random_antag, 2.5, list(ASSIGNMENT_SECURITY = 1), 1, 0, 5),
new /datum/event_meta(EVENT_LEVEL_MODERATE, "Carp School", /datum/event/carp_migration, 0, list(ASSIGNMENT_SECURITY = 30), 1),
new /datum/event_meta(EVENT_LEVEL_MODERATE, "Supply Demand", /datum/event/supply_demand, 0, list(ASSIGNMENT_ANY = 5, ASSIGNMENT_SCIENCE = 15, ASSIGNMENT_GARDENER = 10, ASSIGNMENT_ENGINEER = 10, ASSIGNMENT_MEDICAL = 15), 1),
//new /datum/event_meta(EVENT_LEVEL_MODERATE, "Supply Demand", /datum/event/supply_demand, 0, list(ASSIGNMENT_ANY = 5, ASSIGNMENT_SCIENCE = 15, ASSIGNMENT_GARDENER = 10, ASSIGNMENT_ENGINEER = 10, ASSIGNMENT_MEDICAL = 15), 1), YW EDIT
new /datum/event_meta(EVENT_LEVEL_MODERATE, "Solar Storm", /datum/event/solar_storm, 30, list(ASSIGNMENT_ENGINEER = 40, ASSIGNMENT_SECURITY = 30), 1),
new /datum/event_meta(EVENT_LEVEL_MODERATE, "Space Dust", /datum/event/dust, 0, list(ASSIGNMENT_ENGINEER = 20), 1, 0, 50),
new /datum/event_meta(EVENT_LEVEL_MODERATE, "Gravity Failure", /datum/event/gravity, 75, list(ASSIGNMENT_ENGINEER = 60), 1)

2
code/modules/mob/holder.dm
View File

@@ -199,7 +199,7 @@ var/list/holder_mob_icon_cache = list()
return H
/obj/item/weapon/holder/human
icon = 'icons/mob/holder_complex_yw.dmi' //YW EDIT
icon = 'icons/mob/holder_complex.dmi'
var/list/generate_for_slots = list(slot_l_hand_str, slot_r_hand_str, slot_back_str)
slot_flags = SLOT_BACK

2
code/modules/organs/robolimbs_yw.dm
View File

@@ -23,7 +23,7 @@
/datum/robolimb/xionalt
company = "Xion (alt yw)."
desc = "Xion brand prosthetic limbs."
icon = 'icons/mob/human_races/cyberlimbs/xion/xion_alt5.dmi' //Sprited by: Generalpantsu
icon = 'icons/mob/human_races/cyberlimbs/xion/xion_alt5.dmi' //Sprited by: Whiteout
/datum/robolimb/aphrodite_cyberdoe
company = "Aphrodite - Cyberdoe"

2
code/modules/tgs/core/core.dm
View File

@@ -8,6 +8,8 @@
TGS_ERROR_LOG("Invalid minimum_required_security_level: [minimum_required_security_level]!")
return
#define TGS_V3_API //yw edit FORCE THIS SHIT ON HOLY FUCK
#ifdef TGS_V3_API
if(minimum_required_security_level != TGS_SECURITY_TRUSTED)
TGS_WARNING_LOG("V3 DMAPI requires trusted security!")

9
code/modules/vore/fluffstuff/custom_clothes_yw.dm
View File

@@ -1695,3 +1695,12 @@
return 'icons/vore/custom_clothes_yw_special.dmi'
else
return ..()
/obj/item/clothing/under/harness_white
name = "white gear harness"
desc = "How... minimalist."
icon = 'icons/vore/custom_clothes_yw.dmi'
icon_state = "gear_harness_white"
icon_override = 'icons/vore/custom_clothes_yw.dmi'
item_state = "gear_harness_white"
body_parts_covered = 0

BIN
icons/mob/human_races/cyberlimbs/xion/xion_alt5.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.8 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
icons/turf/areas_yw.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.6 KiB

After

Width:  |  Height:  |  Size: 2.7 KiB

BIN
icons/vore/custom_clothes_yw.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 141 KiB

After

Width:  |  Height:  |  Size: 142 KiB

1395
maps/yw/cryogaia-01-centcomm.dmm
View File

File diff suppressed because it is too large Load Diff

49
maps/yw/cryogaia-04-maintenance.dmm
View File

@@ -12012,6 +12012,7 @@
/obj/structure/disposalpipe/trunk{
dir = 8
},
/obj/machinery/disposal,
/turf/simulated/floor/carpet,
/area/crew_quarters/recreation_area)
"aAj" = (
@@ -39767,6 +39768,10 @@
},
/turf/simulated/floor/tiled,
/area/civilian/atrium/lower)
"bVR" = (
/obj/machinery/vr_sleeper,
/turf/simulated/floor/carpet,
/area/crew_quarters/recreation_area)
"bWT" = (
/obj/machinery/light_switch{
dir = 1;
@@ -40812,6 +40817,12 @@
"uZc" = (
/turf/simulated/wall/titanium,
/area/borealis2/outdoors/grounds/tower/east)
"vwU" = (
/obj/machinery/light{
dir = 8
},
/turf/simulated/floor/carpet,
/area/crew_quarters/recreation_area)
"vEX" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -83590,7 +83601,7 @@ atc
atc
atc
atc
atc
auQ
atc
aAj
atc
@@ -83839,12 +83850,12 @@ ari
aoC
aan
aan
aan
aan
aan
aan
aan
aan
atc
auQ
vwU
auQ
vwU
auQ
aAI
aBr
aBl
@@ -84091,12 +84102,12 @@ aoy
aoC
aan
aan
aan
aan
aan
aan
aan
aan
atc
bVR
bVR
bVR
bVR
bVR
aAI
aBs
aBl
@@ -84343,12 +84354,12 @@ arj
aoC
aan
aan
aan
aan
aan
aan
aan
aan
atc
atc
atc
atc
atc
atc
aAI
aBt
aBl

11
maps/yw/cryogaia_areas.dm
View File

@@ -578,3 +578,14 @@
/area/hallway/secondary/exit_link
name = "\improper Docking Area link"
icon_state = "escape"
// SPECIAL AREAS
/area/vrworld
name = "VR World"
icon = 'icons/turf/areas_yw.dmi'
icon_state = "vr"
requires_power = 0