cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-14 00:23:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Adds RSG immune back to MODsuits that lost it (#25669)

Browse Source 
* Adds RSG immune to Dsquad MODsuits

* Updates string

* Adds trait to Gamma MODsuits for Sec and Medical
This commit is contained in:
DGamerL
2024-05-30 17:26:19 +02:00
committed by GitHub
parent 5a2fd048b1
commit 8440ba64f1
6 changed files with 23 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/clothing/spacesuits/ert_hardsuits.dm
+2 -2
View File
@@ -106,7 +106,7 @@
/obj/item/clothing/suit/space/hardsuit/ert/security/Initialize(mapload)
. = ..()
ADD_TRAIT(src, TRAIT_PUNCTURE_IMMUNE, ROUNDSTART_TRAIT)
ADD_TRAIT(src, TRAIT_RSG_IMMUNE, ROUNDSTART_TRAIT)
//Engineer
/obj/item/clothing/head/helmet/space/hardsuit/ert/engineer
@@ -155,7 +155,7 @@
/obj/item/clothing/suit/space/hardsuit/ert/medical/Initialize(mapload)
. = ..()
ADD_TRAIT(src, TRAIT_PUNCTURE_IMMUNE, ROUNDSTART_TRAIT)
ADD_TRAIT(src, TRAIT_RSG_IMMUNE, ROUNDSTART_TRAIT)
//Janitor
/obj/item/clothing/head/helmet/space/hardsuit/ert/janitor
code/modules/clothing/spacesuits/hardsuit.dm
+1 -1
View File
@@ -388,7 +388,7 @@
/obj/item/clothing/suit/space/hardsuit/syndi/elite/sst/Initialize(mapload)
. = ..()
ADD_TRAIT(src, TRAIT_PUNCTURE_IMMUNE, ROUNDSTART_TRAIT)
ADD_TRAIT(src, TRAIT_RSG_IMMUNE, ROUNDSTART_TRAIT)
/obj/item/clothing/suit/space/hardsuit/syndi/freedom
name = "eagle suit"
code/modules/clothing/spacesuits/misc_spacesuits.dm
+1 -1
View File
@@ -65,7 +65,7 @@
/obj/item/clothing/suit/space/deathsquad/Initialize(mapload)
. = ..()
ADD_TRAIT(src, TRAIT_PUNCTURE_IMMUNE, ROUNDSTART_TRAIT)
ADD_TRAIT(src, TRAIT_RSG_IMMUNE, ROUNDSTART_TRAIT)
/obj/item/clothing/head/helmet/space/deathsquad/beret
name = "officer beret"
code/modules/mob/living/carbon/human/human_mob.dm
+6 -1
View File
@@ -823,6 +823,9 @@
if(HAS_TRAIT(src, TRAIT_PIERCEIMMUNE))
. = FALSE
if(wear_suit && HAS_TRAIT(wear_suit, TRAIT_RSG_IMMUNE))
return FALSE
var/obj/item/organ/external/affecting = get_organ(target_zone)
var/fail_msg
if(!affecting)
@@ -831,8 +834,10 @@
else if(affecting.is_robotic())
. = FALSE
fail_msg = "That limb is robotic."
if(wear_suit && !HAS_TRAIT(wear_suit, TRAIT_PUNCTURE_IMMUNE) && piercing)
if(piercing)
return TRUE
if(target_zone == "head")
if((head?.flags & THICKMATERIAL) && !penetrate_thick)
. = FALSE
code/modules/mod/mod_types.dm
+12 -1
View File
@@ -358,6 +358,10 @@
insignia_type = /obj/item/mod/module/insignia/security
additional_module = /obj/item/mod/module/anomaly_locked/firewall/prebuilt //Defence and flaming hot offence. Good for reflective blob, xenos, antagonists with guns
/obj/item/mod/control/pre_equipped/responsory/security/Initialize(mapload, new_theme, new_skin, new_core, new_access)
. = ..()
ADD_TRAIT(chestplate, TRAIT_RSG_IMMUNE, ROUNDSTART_TRAIT)
/obj/item/mod/control/pre_equipped/responsory/engineer
insignia_type = /obj/item/mod/module/insignia/engineer
additional_module = list(/obj/item/mod/module/anomaly_locked/kinesis/prebuilt, /obj/item/mod/module/firefighting_tank) //This can only end well.
@@ -366,6 +370,10 @@
insignia_type = /obj/item/mod/module/insignia/medic
additional_module = /obj/item/mod/module/defibrillator
/obj/item/mod/control/pre_equipped/responsory/medic/Initialize(mapload, new_theme, new_skin, new_core, new_access)
. = ..()
ADD_TRAIT(chestplate, TRAIT_RSG_IMMUNE, ROUNDSTART_TRAIT)
/obj/item/mod/control/pre_equipped/responsory/janitor
insignia_type = /obj/item/mod/module/insignia/janitor
additional_module = list(/obj/item/mod/module/clamp, /obj/item/mod/module/boot_heating)
@@ -415,6 +423,10 @@
/obj/item/mod/module/magboot/advanced,
)
/obj/item/mod/control/pre_equipped/apocryphal/Initialize(mapload, new_theme, new_skin, new_core, new_access)
. = ..()
ADD_TRAIT(chestplate, TRAIT_RSG_IMMUNE, ROUNDSTART_TRAIT)
/obj/item/mod/control/pre_equipped/apocryphal/officer
applied_modules = list(
/obj/item/mod/module/storage/bluespace,
@@ -431,7 +443,6 @@
/obj/item/mod/module/power_kick, //If you are not drop kicking a xenomorph, what are you doing as an DS commander?
)
/obj/item/mod/control/pre_equipped/corporate
theme = /datum/mod_theme/corporate
applied_core = /obj/item/mod/core/infinite