cyberpresidentvanellope/GS13
1
0
Fork 0
mirror of https://github.com/KabKebab/GS13.git synced 2026-07-12 16:38:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

small code tweaks

Browse Source 
- limited xwg code to 400% rather than 600% max height
- fixed aheal fatness bug
- small code cleaning
- buffed chaos events
- cleared up XWG pref text
- readded *beep to be used by everyone
This commit is contained in:
evilew
2024-05-19 15:58:48 +02:00
parent 7041d21aa8
commit ac779f0724
7 changed files with 40 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GainStation13/code/mechanics/fatness.dm
+2 -1
View File
@@ -60,6 +60,7 @@
/mob/living/carbon/fully_heal(admin_revive)
fatness = 0
fatness_real = 0
. = ..()
///Checks the parent mob's prefs to see if they can be fattened by the fattening_type
@@ -120,6 +121,6 @@
/mob/living/carbon/proc/xwg_resize()
var/xwg_size = sqrt(fatness/FATNESS_LEVEL_BLOB)
xwg_size = min(xwg_size, RESIZE_MACRO)
xwg_size = min(xwg_size, RESIZE_HUGE)
xwg_size = max(xwg_size, custom_body_size*0.01)
resize(xwg_size)
code/game/gamemodes/dynamic/dynamic_rulesets_events.dm
+27 -27
View File
@@ -141,11 +141,11 @@
weight = 2
cost = 5
requirements = list(101,20,15,10,10,10,10,10,10,10)
high_population_requirement = 15
high_population_requirement = 8
//property_weights = list("chaos" = 1, "valid" = 1)
earliest_start = 60 MINUTES //Skyrat change.
occurances_max = 2
chaos_min = 2.5
chaos_min = 1.5
//////////////////////////////////////////////
// //
@@ -161,10 +161,10 @@
weight = 2
cost = 5
requirements = list(101,20,15,10,10,10,10,10,10,10)
high_population_requirement = 15
high_population_requirement = 10
earliest_start = 60 MINUTES
occurances_max = 2
chaos_min = 3
chaos_min = 2
//////////////////////////////////////////////
// //
@@ -248,7 +248,7 @@
earliest_start = 45 MINUTES
repeatable_weight_decrease = 2
requirements = list(101,101,25,25,20,20,15,15,10,10)
high_population_requirement = 30
high_population_requirement = 15
//property_weights = list("extended" = -2)
occurances_max = 2
chaos_min = 3.0
@@ -272,7 +272,7 @@
name = "Meteor Wave: Normal"
cost = 5
typepath = /datum/round_event/meteor_wave
chaos_min = 2.8
chaos_min = 1.9
required_enemies = list(2,2,2,2,1,1,1,1,0,0)
return ..()
@@ -310,11 +310,11 @@
repeatable_weight_decrease = 2
cost = 2
requirements = list(101,101,10,5,5,5,5,5,5,5)
high_population_requirement = 10
high_population_requirement = 15
repeatable = TRUE
//property_weights = list("extended" = 1)
occurances_max = 1
chaos_min = 2.5
chaos_min = 2.4
/datum/dynamic_ruleset/event/anomaly_gravitational
name = "Anomaly: Gravitational"
@@ -345,7 +345,7 @@
repeatable = TRUE
//property_weights = list("extended" = 1)
occurances_max = 2
chaos_min = 2.3
chaos_min = 2.2
/datum/dynamic_ruleset/event/anomaly_vortex
name = "Anomaly: Vortex"
@@ -379,7 +379,7 @@
occurances_max = 1
requirements = list(10,10,10,10,10,10,10,10,10,10) //SECURE THAT DISK
cost = 50
chaos_min = 4
chaos_min = 4.5
map_blacklist = list("LayeniaStation.dmm")
/datum/dynamic_ruleset/event/operative/get_weight()
@@ -410,11 +410,11 @@
enemy_roles = list("Chief Engineer","Station Engineer","Atmospheric Technician")
required_enemies = list(3,2,2,2,1,1,1,0,0,0)
requirements = list(101,25,20,15,15,15,10,10,10,10)
high_population_requirement = 10
high_population_requirement = 12
repeatable = TRUE
//property_weights = list("extended" = -1, "chaos" = 1)
occurances_max = 1
chaos_min = 2.2
chaos_min = 2.4
/datum/dynamic_ruleset/event/carp_migration
name = "Carp Migration"
@@ -425,11 +425,11 @@
cost = 4
requirements = list(101,5,5,5,5,1,1,1,1,1)
high_population_requirement = 10
earliest_start = 10 MINUTES
earliest_start = 30 MINUTES
repeatable = TRUE
//property_weights = list("extended" = 1)
occurances_max = 3
chaos_min = 0.5
chaos_min = 0.7
map_blacklist = list("LayeniaStation.dmm")
/datum/dynamic_ruleset/event/communications_blackout
@@ -445,7 +445,7 @@
high_population_requirement = 5
repeatable = TRUE
//property_weights = list("extended" = 1, "chaos" = 1)
occurances_max = 5
occurances_max = 4
/datum/dynamic_ruleset/event/processor_overload
name = "Processor Overload"
@@ -474,12 +474,12 @@
enemy_roles = list("Chief Engineer","Station Engineer")
required_enemies = list(1,1,1,0,0,0,0,0,0,0)
requirements = list(5,5,5,5,5,5,5,0,0,0)
high_population_requirement = 5
high_population_requirement = 7
repeatable = TRUE
earliest_start = 10 MINUTES
earliest_start = 50 MINUTES
//property_weights = list("extended" = 1)
//always_max_weight = TRUE
occurances_max = 0
occurances_max = 2
map_blacklist = list("LayeniaStation.dmm")
/datum/dynamic_ruleset/event/major_dust
@@ -492,10 +492,10 @@
enemy_roles = list("Chief Engineer","Station Engineer")
required_enemies = list(2,2,1,1,1,1,1,1,1,1)
requirements = list(15,10,9,8,7,6,5,4,3,2)
high_population_requirement = 10
high_population_requirement = 12
repeatable = TRUE
//property_weights = list("extended" = 1)
occurances_max = 2
occurances_max = 1
map_blacklist = list("LayeniaStation.dmm")
@@ -510,7 +510,7 @@
requirements = list(3,3,2,2,1,1,0,0,0,0)
high_population_requirement = 5
repeatable = TRUE
occurances_max = 10
occurances_max = 6
map_blacklist = list("KiloStation.dmm")
// /datum/dynamic_ruleset/event/heart_attack
@@ -569,7 +569,7 @@
enemy_roles = list("AI","Medical Doctor","Station Engineer","Head of Personnel","Captain")
required_enemies = list(2,2,2,2,2,2,2,2,2,0)
requirements = list(5,5,5,5,5,5,5,5,5,5)
high_population_requirement = 5
high_population_requirement = 6
//property_weights = list("extended" = 1)
occurances_max = 2
chaos_min = 1.3
@@ -692,7 +692,7 @@
/datum/dynamic_ruleset/event/bureaucratic_error
name = "Bureaucratic Error"
requirements = list(0,0,0,0,0,0,0,0,0,0)
high_population_requirement = 0
high_population_requirement = 8
typepath = /datum/round_event/bureaucratic_error
occurances_max = 1
weight = 5
@@ -748,7 +748,7 @@
weight = 4
repeatable_weight_decrease = 5
repeatable = TRUE
occurances_max = 2
occurances_max = 3
/datum/dynamic_ruleset/event/mice_migration
name = "Mice Migration"
@@ -756,7 +756,7 @@
enemy_roles = list("Chief Engineer","Station Engineer","Atmospheric Technician")
required_enemies = list(1,1,1,1,1,1,0,0,0,0)
requirements = list(5,5,5,5,0,0,0,0,0,0)
high_population_requirement = 0
high_population_requirement = 5
weight = 10
repeatable_weight_decrease = 3
repeatable = TRUE
@@ -802,10 +802,10 @@
required_enemies = list(2,2,2,1,1,1,1,1,1,0)
requirements = list(101,101,10,9,8,7,5,5,5,0)
cost = 2
high_population_requirement = 18
high_population_requirement = 12
weight = 4
repeatable_weight_decrease = 2
earliest_start = 20 MINUTES
earliest_start = 50 MINUTES
repeatable = TRUE
occurances_max = 2
code/modules/antagonists/cult/runes.dm
+1 -1
View File
@@ -1018,7 +1018,7 @@ structure_check() searches for nearby cultist structures required for the invoca
if(intensity>=285) // Based on the prior formula, this means the cult makes up <15% of current players
var/outcome = rand(1,100)
switch(outcome)
if(1 to 10)
if(1 to 20)
var/datum/round_event_control/disease_outbreak/D = new()
var/datum/round_event_control/mice_migration/M = new()
D.runEvent()
code/modules/client/preferences.dm
+1 -1
View File
@@ -1059,7 +1059,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
dat += "<b>Weight Gain - Weapons:</b><a href='?_src_=prefs;preference=weight_gain_weapons'>[weight_gain_weapons == TRUE ? "Enabled" : "Disabled"]</a><BR>"
dat += "<b>Weight Gain - Magic:</b><a href='?_src_=prefs;preference=weight_gain_magic'>[weight_gain_magic == TRUE ? "Enabled" : "Disabled"]</a><BR>"
dat += "<b>Weight Gain - Viruses:</b><a href='?_src_=prefs;preference=weight_gain_viruses'>[weight_gain_viruses == TRUE ? "Enabled" : "Disabled"]</a><BR>"
dat += "<b>Extreme Weight Gain:</b><a href='?_src_=prefs;preference=weight_gain_extreme'>[weight_gain_extreme == TRUE ? "Enabled" : "Disabled"]</a><BR>"
dat += "<b>Extreme Weight Gain (Sprite Size scales with weight):</b><a href='?_src_=prefs;preference=weight_gain_extreme'>[weight_gain_extreme == TRUE ? "Enabled" : "Disabled"]</a><BR>"
//Add the Hyper stuff below here
dat += "<h2>Hyper Preferences</h2>"
code/modules/mob/living/emote.dm
-1
View File
@@ -537,7 +537,6 @@
message = "beeps."
message_param = "beeps at %t."
sound = 'sound/machines/twobeep.ogg'
mob_type_allowed_typecache = list(/mob/living/brain, /mob/living/silicon)
/datum/emote/living/circle
key = "circle"
code/modules/mob/mob_helpers.dm
+8 -8
View File
@@ -119,23 +119,23 @@
if(rand(1,100)<=strength * 0.5)
var/lowerletter = lowertext(newletter)
if(lowerletter == "o")
newletter = " -*BURRP*- "
newletter = " ++BURRP++ "
else if(lowerletter == "s")
newletter = " -*URP*- "
newletter = " ++URP++ "
else if(lowerletter == "a")
newletter = " -*GWUURRP*- "
newletter = " ++GWUURRP++ "
else if(lowerletter == "u")
newletter = " -*BUUUURRP*- "
newletter = " ++BUUUURRP++ "
else if(lowerletter == "c")
newletter = " -*BURP*- "
newletter = " ++BURP++ "
if(rand(1,100) <= strength * 0.25)
if(newletter == " ")
newletter = "...*GWWUUARRP*..."
newletter = "...++GWWUUARRP++..."
else if(newletter == ".")
newletter = " -*BWUUARRP*-."
newletter = " ++BWUUARRP++."
switch(rand(1,100) <= strength * 0.5)
if(1)
newletter += " -*BURRP*- "
newletter += " ++BURRP++ "
if(10)
newletter += "[newletter]"
if(20)
code/modules/vehicles/speedbike.dm
+1 -1
View File
@@ -18,7 +18,7 @@
/obj/vehicle/ridden/space/speedbike/Initialize()
. = ..()
overlay = mutable_appearance(icon, overlay_state, ABOVE_MOB_LAYER)
overlay = mutable_appearance(icon, overlay_state, BELOW_MOB_LAYER)
add_overlay(overlay)
var/datum/component/riding/D = LoadComponent(/datum/component/riding)
D.set_riding_offsets(RIDING_OFFSET_ALL, list(TEXT_NORTH = list(0, -8), TEXT_SOUTH = list(0, 4), TEXT_EAST = list(-10, 5), TEXT_WEST = list( 10, 5)))