cyberpresidentvanellope/GS13
1
0
Fork 0
mirror of https://github.com/KabKebab/GS13.git synced 2026-07-09 23:21:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

tweaks n fixes

Browse Source 
- buffed lipolicide weight loss
- buffed punching bag weight loss
- made chocolate slimes much more beefier
- added modular bra (WIP)
- readded radstorm (admin only)
- added fattening vent clog into event pool
This commit is contained in:
evilew
2024-06-03 19:51:01 +02:00
parent 06d72f983b
commit c1f082982e
11 changed files with 99 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/events/radiation_storm.dm
+14 -14
View File
@@ -1,19 +1,19 @@
// /datum/round_event_control/radiation_storm
// name = "Radiation Storm"
// typepath = /datum/round_event/radiation_storm
// max_occurrences = 1
/datum/round_event_control/radiation_storm
name = "Radiation Storm"
typepath = /datum/round_event/radiation_storm
max_occurrences = 1
// /datum/round_event/radiation_storm
/datum/round_event/radiation_storm
// /datum/round_event/radiation_storm/setup()
// startWhen = 3
// endWhen = startWhen + 1
// announceWhen = 1
/datum/round_event/radiation_storm/setup()
startWhen = 3
endWhen = startWhen + 1
announceWhen = 1
// /datum/round_event/radiation_storm/announce(fake)
// priority_announce("High levels of radiation detected near the station. Maintenance is best shielded from radiation.", "Anomaly Alert", 'sound/ai/radiation.ogg')
// //sound not longer matches the text, but an audible warning is probably good
/datum/round_event/radiation_storm/announce(fake)
priority_announce("High levels of radiation detected near the station. Maintenance is best shielded from radiation.", "Anomaly Alert", 'sound/ai/radiation.ogg')
//sound not longer matches the text, but an audible warning is probably good
// /datum/round_event/radiation_storm/start()
// SSweather.run_weather(/datum/weather/rad_storm)
/datum/round_event/radiation_storm/start()
SSweather.run_weather(/datum/weather/rad_storm)
code/modules/events/vent_clog.dm
+4 -4
View File
@@ -173,8 +173,8 @@
name = "Clogged Vents: Fattening Chems"
typepath = /datum/round_event/vent_clog_fat
weight = 8
max_occurrences = 1
min_players = 10
max_occurrences = 3
min_players = 6
/datum/round_event/vent_clog_fat
announceWhen = 1
@@ -184,7 +184,7 @@
var/list/vents2 = list()
var/randomProbability2 = 1
var/reagentsAmount2 = 100
var/list/saferChems2 = list(
var/list/fatchems = list(
/datum/reagent/consumable/lipoifier,
/datum/reagent/consumable/nutriment,
)
@@ -225,7 +225,7 @@
if (prob(randomProbability2))
R.add_reagent(get_random_reagent_id(), reagentsAmount2)
else
R.add_reagent(pick(saferChems2), reagentsAmount2)
R.add_reagent(pick(fatchems), reagentsAmount2)
var/datum/effect_system/smoke_spread/chem/smoke_machine/C = new
C.set_up(R,16,1,T)
code/modules/mining/lavaland/ruins/gym.dm
+1 -1
View File
@@ -7,7 +7,7 @@
layer = WALL_OBJ_LAYER
var/list/hit_sounds = list('sound/weapons/genhit1.ogg', 'sound/weapons/genhit2.ogg', 'sound/weapons/genhit3.ogg',\
'sound/weapons/punch1.ogg', 'sound/weapons/punch2.ogg', 'sound/weapons/punch3.ogg', 'sound/weapons/punch4.ogg')
var/loss_per_punch = 2.5 // GS13
var/loss_per_punch = 5 // GS13
/obj/structure/punching_bag/attack_hand(mob/user as mob)
. = ..()
code/modules/reagents/chemistry/reagents/toxin_reagents.dm
+1 -1
View File
@@ -625,7 +625,7 @@
if(HAS_TRAIT(M, TRAIT_LIPOLICIDE_TOLERANCE)) //GS13 edit
M.adjust_fatness(-0.5, FATTENING_TYPE_WEIGHT_LOSS)
else
M.adjust_fatness(-5, FATTENING_TYPE_WEIGHT_LOSS)
M.adjust_fatness(-10, FATTENING_TYPE_WEIGHT_LOSS)
M.overeatduration = 0
return ..()