Skip to content

Commit

Permalink
Gas Mask functionality + Sulfur Harvest expansion!!! (#2519)
Browse files Browse the repository at this point in the history 
Adds in functionality to gas masks (basic for now, will just prevent you from triggering the effects of gases(very primitive, don't yell at me))

Adds in randomly generating sulfur nodes under Snowcrest, which can have different values and production rates.

Adds in pocklung, a 'disease' from ""Sulfur-thriving radioactive bacterias"" that eat away at the lungs... and potentially are quirky? Find out IC.

Also adds in the m79 Grenade launcher... But it's kind of bad rn.

I have a big issue: Vapour touch/inhale procs trigger slow. Really slow. CS Gas is COMPLETELY ineffective because it waits for you to do a life process... Not good. need help! AAAAAA
  • Loading branch information
@ProfessorPopoff
ProfessorPopoff authored May 17, 2024
1 parent 3e614d2 commit 428b74c
Show file tree
Hide file tree
Showing 36 changed files with 568 additions and 85 deletions.
80 changes: 42 additions & 38 deletions _maps/map_files/Mammoth_Mini/Mammoth_mini_below.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -692,7 +692,7 @@
/obj/effect/turf_decal/ms13/graffiti/many_eyes,
/obj/effect/turf_decal/ms13/covering/paint/white,
/turf/closed/wall/ms13/metal,
/area/ms13/ncr/building)
/area/ms13/snowcrest/republic)
"aeW" = (
/obj/effect/landmark/latejoin,
/turf/open/floor/ms13/sewer,
Expand Down Expand Up @@ -743,7 +743,7 @@
/obj/effect/turf_decal/ms13/graffiti/questionmarks3,
/obj/effect/turf_decal/ms13/covering/paint/white,
/turf/closed/wall/ms13/metal,
/area/ms13/ncr/building)
/area/ms13/snowcrest/republic)
"afn" = (
/obj/effect/spawner/random/ms13/crafting/lowrandom,
/obj/structure/table/ms13/metal/heavy,
Expand Down Expand Up @@ -838,17 +838,17 @@
"agh" = (
/obj/structure/bed/ms13/bedframe/wood,
/turf/open/floor/ms13/concrete,
/area/ms13/ncr/building)
/area/ms13/snowcrest/republic)
"agi" = (
/obj/structure/ms13/trash/cardboard{
dir = 8
},
/turf/open/floor/ms13/concrete,
/area/ms13/ncr/building)
/area/ms13/snowcrest/republic)
"agj" = (
/obj/structure/ms13/wall_decor/calendar,
/turf/open/floor/ms13/concrete,
/area/ms13/ncr/building)
/area/ms13/snowcrest/republic)
"agk" = (
/obj/structure/ms13/storage/shelf{
dir = 8
Expand Down Expand Up @@ -926,7 +926,7 @@
"agD" = (
/obj/structure/ms13/rug/rubber,
/turf/open/floor/ms13/concrete/bricks,
/area/ms13/ncr/building)
/area/ms13/snowcrest/republic)
"agH" = (
/obj/machinery/light/ms13,
/turf/open/floor/ms13/concrete/industrial,
Expand Down Expand Up @@ -973,7 +973,7 @@
"ahb" = (
/obj/structure/ms13/trash/wood,
/turf/open/floor/ms13/concrete/bricks,
/area/ms13/ncr/building)
/area/ms13/snowcrest/republic)
"ahc" = (
/obj/machinery/door/poddoor/shutters/ms13/horizontal/indestructible/red/right/pre_open{
id = "enclave_exterior"
Expand All @@ -983,7 +983,7 @@
"ahe" = (
/obj/structure/ms13/trash/papers/one,
/turf/open/floor/ms13/concrete,
/area/ms13/ncr/building)
/area/ms13/snowcrest/republic)
"ahf" = (
/obj/effect/turf_decal/trimline/yellow/line{
dir = 4
Expand Down Expand Up @@ -1012,7 +1012,7 @@
},
/obj/structure/ms13/bars/rusty,
/turf/open/floor/ms13/concrete/bricks,
/area/ms13/ncr/building)
/area/ms13/snowcrest/republic)
"ahp" = (
/obj/item/claymore/ms13/baton,
/obj/effect/decal/cleanable/blood/old,
Expand Down Expand Up @@ -1049,7 +1049,7 @@
dir = 6
},
/turf/open/floor/ms13/concrete,
/area/ms13/ncr/building)
/area/ms13/snowcrest/republic)
"ahz" = (
/obj/machinery/light/ms13/bulb{
dir = 8
Expand All @@ -1070,7 +1070,7 @@
/obj/effect/turf_decal/ms13/graffiti/no_way,
/obj/effect/turf_decal/ms13/covering/paint/white,
/turf/closed/wall/ms13/metal,
/area/ms13/ncr/building)
/area/ms13/snowcrest/republic)
"ahI" = (
/obj/structure/ms13/storage/washingmachine/industrial,
/turf/open/floor/ms13/metal,
Expand Down Expand Up @@ -5133,7 +5133,7 @@
/area/ms13/underground/mountain)
"aSg" = (
/turf/open/floor/ms13/concrete,
/area/ms13/ncr/building)
/area/ms13/snowcrest/republic)
"aSp" = (
/obj/machinery/shower/ms13{
dir = 8;
Expand Down Expand Up @@ -6150,7 +6150,7 @@
id = "ncr-contain-2"
},
/turf/open/floor/ms13/concrete/bricks,
/area/ms13/ncr/building)
/area/ms13/snowcrest/republic)
"bBM" = (
/obj/structure/ms13/trash/papers/one,
/turf/open/floor/ms13/sewer,
Expand Down Expand Up @@ -6455,11 +6455,11 @@
id = "ncr-contain-3"
},
/turf/open/floor/ms13/concrete/bricks,
/area/ms13/ncr/building)
/area/ms13/snowcrest/republic)
"cix" = (
/obj/effect/turf_decal/ms13/covering/paint/white,
/turf/closed/wall/ms13/metal,
/area/ms13/ncr/building)
/area/ms13/snowcrest/republic)
"ciU" = (
/obj/structure/table/ms13/no_smooth/wood,
/obj/effect/spawner/random/ms13/drink/alcohol,
Expand Down Expand Up @@ -7118,7 +7118,7 @@
},
/obj/structure/ms13/bars/rusty,
/turf/open/floor/ms13/concrete,
/area/ms13/ncr/building)
/area/ms13/snowcrest/republic)
"dTu" = (
/obj/structure/ms13/barrel/single/waste/one,
/turf/open/floor/plating/ms13/ground/mountain,
Expand Down Expand Up @@ -7189,7 +7189,7 @@
/area/ms13/underground/sewer)
"eca" = (
/turf/closed/wall/ms13/metal,
/area/ms13/ncr/building)
/area/ms13/snowcrest/republic)
"edc" = (
/obj/machinery/door/unpowered/ms13/wood{
dir = 1
Expand Down Expand Up @@ -7377,7 +7377,7 @@
"ewV" = (
/obj/machinery/door/airlock/ms13/town/security,
/turf/open/floor/ms13/concrete/bricks,
/area/ms13/ncr/building)
/area/ms13/snowcrest/republic)
"exe" = (
/obj/effect/landmark/start/ms13/bartender,
/turf/open/floor/wood/ms13/wide,
Expand Down Expand Up @@ -7731,7 +7731,7 @@
"fMu" = (
/obj/structure/ms13/rug/mat/welcome,
/turf/open/floor/ms13/concrete/bricks,
/area/ms13/ncr/building)
/area/ms13/snowcrest/republic)
"fNK" = (
/obj/effect/spawner/random/ms13/drugs/lowrandom,
/turf/open/floor/plating/ms13/ground/mountain,
Expand Down Expand Up @@ -8089,7 +8089,7 @@
/area/ms13/underground/sewer)
"gDU" = (
/turf/open/floor/ms13/concrete/bricks,
/area/ms13/ncr/building)
/area/ms13/snowcrest/republic)
"gEO" = (
/obj/structure/ms13/bonepile,
/obj/machinery/light/ms13/bulb/industrial{
Expand Down Expand Up @@ -9272,7 +9272,7 @@
"jHx" = (
/obj/structure/stairs/west,
/turf/open/floor/ms13/concrete,
/area/ms13/ncr/building)
/area/ms13/snowcrest/republic)
"jHM" = (
/obj/structure/ms13/large_pipe,
/obj/structure/ms13/trash/papers/two{
Expand Down Expand Up @@ -9370,7 +9370,7 @@
/obj/structure/stairs/west,
/obj/machinery/light/ms13/bulb/industrial,
/turf/open/floor/ms13/concrete,
/area/ms13/ncr/building)
/area/ms13/snowcrest/republic)
"kar" = (
/obj/structure/filingcabinet/ms13{
dir = 1;
Expand Down Expand Up @@ -10535,7 +10535,7 @@
"mUZ" = (
/obj/machinery/light/ms13/bulb/industrial,
/turf/open/floor/ms13/concrete,
/area/ms13/ncr/building)
/area/ms13/snowcrest/republic)
"mVk" = (
/obj/item/knife/ms13,
/obj/effect/decal/cleanable/blood/drip{
Expand Down Expand Up @@ -11433,7 +11433,7 @@
},
/obj/structure/ms13/bars/rusty,
/turf/open/floor/ms13/concrete/bricks,
/area/ms13/ncr/building)
/area/ms13/snowcrest/republic)
"pbG" = (
/obj/structure/table/ms13/metal,
/obj/machinery/light/ms13/bulb{
Expand Down Expand Up @@ -11799,7 +11799,7 @@
"qac" = (
/obj/structure/stairs/west,
/turf/open/floor/ms13/concrete/bricks,
/area/ms13/ncr/building)
/area/ms13/snowcrest/republic)
"qbY" = (
/turf/open/floor/ms13/metal/pipe{
dir = 1
Expand Down Expand Up @@ -12087,6 +12087,10 @@
dir = 1
},
/area/ms13/underground/enclave_base)
"qKG" = (
/obj/effect/spawner/random/ms13/ore_node/sulfur,
/turf/open/floor/plating/ms13/ground/mountain,
/area/ms13/underground/mountain)
"qLl" = (
/obj/effect/turf_decal/trimline/yellow/line{
dir = 8
Expand Down Expand Up @@ -12182,7 +12186,7 @@
id = "ncr-contain-2"
},
/turf/open/floor/ms13/concrete/bricks,
/area/ms13/ncr/building)
/area/ms13/snowcrest/republic)
"rdI" = (
/obj/effect/spawner/random/ms13/clothing/shoe,
/turf/open/floor/wood/ms13/carpet/blue,
Expand Down Expand Up @@ -12305,7 +12309,7 @@
id = "ncr-contain-3"
},
/turf/open/floor/ms13/concrete/bricks,
/area/ms13/ncr/building)
/area/ms13/snowcrest/republic)
"rws" = (
/mob/living/basic/ms13/ghoul,
/turf/open/floor/ms13/concrete/bricks,
Expand Down Expand Up @@ -14370,7 +14374,7 @@
id = "ncr-contain-1"
},
/turf/open/floor/ms13/concrete,
/area/ms13/ncr/building)
/area/ms13/snowcrest/republic)
"wDi" = (
/obj/structure/ms13/barrel/triple/yellow/two,
/turf/open/floor/plating/ms13/ground/mountain,
Expand Down Expand Up @@ -14732,7 +14736,7 @@
id = "ncr-contain-1"
},
/turf/open/floor/ms13/concrete/bricks,
/area/ms13/ncr/building)
/area/ms13/snowcrest/republic)
"xLp" = (
/obj/structure/ms13/pipes/horizontal/box,
/turf/open/floor/ms13/metal/pipe{
Expand Down Expand Up @@ -39399,7 +39403,7 @@ afU
afU
afU
akx
akx
qKG
akx
akx
afU
Expand Down Expand Up @@ -41909,7 +41913,7 @@ afU
eca
eca
eca
eca
cix
bBn
aSg
eca
Expand Down Expand Up @@ -43464,7 +43468,7 @@ akx
akx
akx
akx
akx
qKG
akx
akx
akx
Expand Down Expand Up @@ -44143,7 +44147,7 @@ afU
akx
akx
akx
akx
qKG
akx
akx
akx
Expand Down Expand Up @@ -44853,7 +44857,7 @@ akx
afU
akx
akx
akx
qKG
akx
akx
akx
Expand Down Expand Up @@ -45060,7 +45064,7 @@ afU
afU
afU
akx
akx
qKG
akx
akx
akx
Expand Down Expand Up @@ -47356,7 +47360,7 @@ akx
akx
akx
akx
akx
qKG
akx
akx
lzM
Expand Down Expand Up @@ -48014,7 +48018,7 @@ afU
afU
afU
akx
akx
qKG
akx
akx
akx
Expand All @@ -48031,7 +48035,7 @@ aaI
akx
akx
akx
akx
qKG
akx
afU
afU
Expand Down
4 changes: 4 additions & 0 deletions code/__DEFINES/traits.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -875,6 +875,10 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai

#define TRAIT_IN_POWERARMOUR "in_powerarmour" //If this person is wearing power armour actively

#define TRAIT_WEARING_GAS_MASK "wearing_gasmask" //If this person is wearing a gas mask

#define TRAIT_PROTECTIVE_SUIT "wearing_protection" //If this person is wearing a suit that would render them immune from... CHEMICAL WARFARE

#define TRAIT_SHOVEIMMUNE "shove_immune"//Makes the user completely immune to shoving

// MOJAVE JOB TRAITS END
5 changes: 3 additions & 2 deletions code/datums/diseases/_disease.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@
var/agent = "some microbes"
var/spread_text = ""
var/cure_text = ""

/// MOJAVE SUN EDIT- Text displayed for text pushes
var/sicktext = "You're not feeling so hot" // MOJAVE SUN EDIT
//Stages
var/stage = 1
var/max_stages = 0
Expand Down Expand Up @@ -60,7 +61,7 @@

var/turf/source_turf = get_turf(infectee)
log_virus("[key_name(infectee)] was infected by virus: [src.admin_details()] at [loc_name(source_turf)]")
infectee.throw_alert_text(/atom/movable/screen/alert/text/nohappy, "You're not feeling so hot.", override = FALSE) // MOJAVE SUN EDIT - FO text alert
infectee.throw_alert_text(/atom/movable/screen/alert/text/nohappy, sicktext, override = FALSE) // MOJAVE SUN EDIT - FO text alert

//Return a string for admin logging uses, should describe the disease in detail
/datum/disease/proc/admin_details()
Expand Down
1 change: 1 addition & 0 deletions code/modules/client/preferences/ambient_occlusion.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
category = PREFERENCE_CATEGORY_GAME_PREFERENCES
savefile_key = "ambientocclusion"
savefile_identifier = PREFERENCE_PLAYER
default_value = FALSE // MS13 EDIT

/datum/preference/toggle/ambient_occlusion/apply_to_client(client/client, value)
/// Backdrop for the game world plane.
Expand Down
6 changes: 6 additions & 0 deletions mojave/areas/area.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,12 @@
icon_state = "mountain"
sound_environment = SOUND_ENVIRONMENT_CAVE

/area/ms13/underground/mountain/cave
name = "enclosed cave"
dissipation_rate = 1 //Prime for sulfur cloud buildup! Keep your mask close!
icon_state = "cave"
sound_environment = SOUND_ENVIRONMENT_CAVE

/area/ms13/underground/mountain_bunker
name = "Mountain Bunker"
icon_state = "mountain_bunker"
Expand Down
Loading

0 comments on commit 428b74c

Please sign in to comment.