cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-26 06:40:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

Lesser Lightweight (#8823)

Browse Source 
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
FluffMedic
2024-08-27 08:17:27 +02:00
committed by GitHub
co-authored by Kashargul
parent 65c9c8d609
commit 7895fa838a
4 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/species/station/traits_vr/negative.dm
+1
View File
@@ -137,6 +137,7 @@
desc = "Your light weight and poor balance make you very susceptible to unhelpful bumping. Think of it like a bowling ball versus a pin. (STOP TAKING THIS AS SECURITY! We're MRP, so expect to lose your junk immediately, especially in events. - Love, Admins)" //CHOMP Edit btw
cost = -2
var_changes = list("lightweight" = 1)
excludes = list(/datum/trait/negative/lightweight_light) //CHOMPedit Added a lesser version of this trait
custom_only = FALSE
/datum/trait/negative/neural_hypersensitivity
code/modules/mob/living/living_movement.dm
+6
View File
@@ -148,6 +148,12 @@ default behaviour is:
H.Weaken(5)
now_pushing = 0
return
//CHOMPSTATION edit Adding alternative to lightweight
if(H.species.lightweight_light == 1 && H.a_intent == I_HELP)
H.visible_message("<span class='warning'>[src] bumps into [H], knocking them off balance!</span>")
H.Weaken(5)
now_pushing = 0
return
//CHOMPSTATION edit - bringing back mandatory step mechanics, fetish stuff removed if no prefs
// Handle grabbing, stomping, and such of micros!
if(step_mechanics_pref && tmob.step_mechanics_pref)
modular_chomp/code/modules/mob/living/carbon/human/species/species.dm
+1
View File
@@ -16,6 +16,7 @@
var/waking_speed = 1
var/mudking = FALSE
var/vanity_base_fit //when shapeshifting using vanity_copy_to, this allows you to have add something so they can go back to their original species fit
var/lightweight_light = 0
// Handles non-standard eyes when using a species that utilizes a custom base icon set.
// Eye data is stored in the head organ, and this needs to be handled specially.
modular_chomp/code/modules/mob/living/carbon/human/species/station/traits/negative.dm
+8 -2
View File
@@ -12,7 +12,6 @@
var_changes = list("minimum_breath_pressure" = 18)
excludes = list(/datum/trait/positive/light_breather)
/datum/trait/negative/thick_digits
name = "Thick Digits"
desc = "Your hands are not shaped in a way that allows useage of guns."
@@ -66,7 +65,6 @@
var_changes = list("flags" = NO_SCAN)
excludes = list(/datum/trait/negative/nodefib) //No, just, no
/datum/trait/negative/meltable
name = "Water Weakness"
desc = "Due to your biology, water is harmful to you."
@@ -90,3 +88,11 @@
custom_only = TRUE
var_changes = list("flags" = NO_SCAN, NO_DEFIB)
excludes = list(/datum/trait/negative/nodefib, /datum/trait/negative/noresleeve)
/datum/trait/negative/lightweight_light
name = "Lesser Lightweight"
desc = "Your light weight and poor balance make you very susceptible to unhelpful bumping if you are unprepared)"
cost = -1
var_changes = list("lightweight_light" = 1)
excludes = list(/datum/trait/negative/lightweight)
custom_only = FALSE