cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-28 15:39:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

Sandstorm Tweaks (#19370)

Browse Source 
Sandstorm damage now respects armor, and will not damage Vaurca and IPCs
as much.
Ponchos, mantles, straw hats, Unathi robes, and hoods now protect
against weather.
Sandstorms can now cause pain and impair vision if a mob's eyes are
unprotected.
Adds protective gear to Wasteland ghostroles who didn't already have it.

---------

Signed-off-by: RustingWithYou <63625389+RustingWithYou@users.noreply.github.com>
Signed-off-by: Matt Atlas <mattiathebest2000@hotmail.it>
Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it>
This commit is contained in:
RustingWithYou
2024-07-01 13:12:32 +00:00
committed by GitHub
co-authored by Matt Atlas
parent 1926b6b612
commit 81f77e6e43
28 changed files with 222 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/human_species.dm
+1
View File
@@ -66,6 +66,7 @@ INITIALIZE_IMMEDIATE(/mob/living/carbon/human/dummy/mannequin)
/mob/living/carbon/human/stok/moghes
faction = "Moghes"
resists_weather = TRUE
/mob/living/carbon/human/bug/Initialize(mapload)
. = ..(mapload, SPECIES_MONKEY_VAURCA)
code/modules/mob/living/living_defines.dm
+3
View File
@@ -77,3 +77,6 @@
///what icon the mob uses for speechbubbles
var/bubble_icon = "default"
///If true, ignores weather effects
var/resists_weather = FALSE
code/modules/mob/living/simple_animal/friendly/moghes.dm
+5
View File
@@ -35,6 +35,7 @@
bullet = ARMOR_BALLISTIC_MINOR,
bomb = ARMOR_BOMB_MINOR
)
resists_weather = TRUE
sample_data = list("Cellular biochemistry shows high metabolic capacity", "Tissue sample contains high muscle content", "Genetic biomarkers identified linked with passiveness and domestication")
/mob/living/simple_animal/threshbeast/saddle
@@ -85,6 +86,7 @@
laser = ARMOR_LASER_MINOR,
bomb = ARMOR_BOMB_MINOR
)
resists_weather = TRUE
sample_data = list("Cellular biochemistry shows high metabolic capacity", "Tissue sample contains high muscle content", "Genetic biomarkers identified linked with domestication", "Intracellular keratin synthesis present")
/mob/living/simple_animal/hostile/retaliate/hegeranzi/saddle
@@ -98,6 +100,7 @@
name = "orszi fish"
desc = "A small fish native to the rivers and seas of the planet Moghes, the orzsi or 'swarm fish' is a common food source for noble and common Unathi alike."
faction = "Moghes"
resists_weather = TRUE
/mob/living/simple_animal/otzek
name = "otzek"
@@ -127,6 +130,7 @@
butchering_products = list(/obj/item/stack/material/animalhide/lizard = 4)
meat_type = /obj/item/reagent_containers/food/snacks/meat/moghes
meat_amount = 16
resists_weather = TRUE
sample_data = list("Cellular biochemistry geared towards the use of plant-based nutrition", "Genetic biomarkers identified linked with high reproductive rates", "Intracellular keratin synthesis present")
/mob/living/simple_animal/miervesh
@@ -155,6 +159,7 @@
butchering_products = list(/obj/item/stack/material/animalhide = 1)
meat_type = /obj/item/reagent_containers/food/snacks/meat/moghes
meat_amount = 1
resists_weather = TRUE
sample_data = list("Cellular biochemistry shows signs of rapid respiration", "Genetic biomarkers identified linked with passiveness and domestication", "Extracellular gas detection present")
var/chosen_icon
code/modules/mob/living/simple_animal/hostile/moghes.dm
+2
View File
@@ -35,6 +35,7 @@
faction = "Moghes"
butchering_products = list(/obj/item/stack/material/animalhide/lizard = 20)
resists_weather = TRUE
sample_data = list("Cellular biochemistry shows high metabolic capacity", "Tissue sample contains high muscle content", "Genetic biomarkers identified linked with aggressiveness", "Intracellular keratin synthesis present")
var/is_devouring = FALSE
@@ -164,6 +165,7 @@
meat_type = /obj/item/reagent_containers/food/snacks/meat/moghes
meat_amount = 10
faction = "Moghes"
resists_weather = TRUE
sample_data = list("Cellular structures adapted to provide strong resonance protection", "Genetic biomarkers identified linked with agressiveness")
var/shriek_time = 0
code/modules/mob/mob.dm
+5
View File
@@ -1459,6 +1459,11 @@
var/obj/item/clothing/suit/check_body = get_equipped_item(slot_wear_suit_str)
if(!istype(check_body) || !check_body.protects_against_weather)
return
for(var/obj/item/clothing/clothing in list(w_uniform, wear_suit, head))
for(var/obj/item/clothing/accessory/check_accessory in clothing)
if(!istype(check_accessory) || !check_accessory.protects_against_weather)
continue
LAZYADD(., check_accessory)
LAZYADD(., check_head)
LAZYADD(., check_body)