Skip to content

Commit

Permalink
Civilian survs now spawn with snow gear (#5533)
Browse files Browse the repository at this point in the history
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->

# About the pull request
snow map survs now spawn with snow gear. previously they wouldn't due to
their random equipment getting picked first, leading to them not getting
any snowgear and freezing to death. fixes #5530

sadly this means that they lose most of their unique gear, but I guess
the alternative is freezing to death instantly.
<!-- Remove this text and explain what the purpose of your PR is.

Mention if you have tested your changes. If you changed a map, make sure
you used the mapmerge tool.
If this is an Issue Correction, you can type "Fixes Issue #169420" to
link the PR to the corresponding Issue number #169420.

Remember: something that is self-evident to you might not be to others.
Explain your rationale fully, even if you feel it goes without saying.
-->

# Explain why it's good for the game

survs should at least have a chance to survive? maybe?
<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding, and may discourage maintainers from reviewing or merging
your PR. This section is not strictly required for (non-controversial)
fix PRs or backend PRs. -->


# Testing Photographs and Procedure
<!-- Include any screenshots/videos/debugging steps of the modified code
functioning successfully, ideally including edge cases. -->
<details>
<summary>I got a picture</summary>


![image](https://github.com/cmss13-devs/cmss13/assets/54422837/849508c8-f88d-472b-8082-724aa6470cc1)

</details>


# Changelog

<!-- If your PR modifies aspects of the game that can be concretely
observed by players or admins you should add a changelog. If your change
does NOT meet this description, remove this section. Be sure to properly
label your changes in the changelog. Please note that maintainers freely
reserve the right to remove and add tags should they deem it
appropriate. You can attempt to finagle the system all you want, but
it's best to shoot for clear communication right off the bat. -->
<!-- If you add a name after the ':cl', that name will be used in the
changelog. You must add your CKEY after the CL if your GitHub name
doesn't match. Maintainers freely reserve the right to remove and add
tags should they deem it appropriate. -->

:cl:
fix: Civilian survs will now spawn with snow gear on snow maps.
/:cl:

<!-- Both :cl:'s are required for the changelog to work! -->
  • Loading branch information
private-tristan authored Jan 28, 2024
1 parent ef25cff commit 92f00bd
Showing 1 changed file with 3 additions and 13 deletions.
16 changes: 3 additions & 13 deletions code/modules/gear_presets/survivors/misc.dm
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,8 @@ Everything below isn't used or out of place.
access = list(ACCESS_CIVILIAN_PUBLIC)

/datum/equipment_preset/survivor/civilian/load_gear(mob/living/carbon/human/new_human)
if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD])
add_ice_colony_survivor_equipment(new_human)
var/random_gear = rand(0, 3)
switch(random_gear)
if(0) // Normal Colonist
Expand Down Expand Up @@ -89,8 +91,6 @@ Everything below isn't used or out of place.
new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/apron(new_human), WEAR_JACKET)
new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET)
new_human.equip_to_slot_or_del(new /obj/item/tool/hatchet(new_human.back), WEAR_IN_BACK)
if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD])
add_ice_colony_survivor_equipment(new_human)
new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/norm(new_human), WEAR_BACK)
new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general(new_human), WEAR_R_STORE)
add_survivor_weapon_civilian(new_human)
Expand Down Expand Up @@ -297,17 +297,7 @@ Everything below isn't used or out of place.

// ----- Hostile Survivors

/*
datum/equipment_preset/survivor/clf/cold is never used
and as a three proc attach to it that are defacto never used eitheir.
handled proc in datum/equipment_preset/survivor/clf/cold:
spawn_rebel_suit
spawn_rebel_helmet
spawn_rebel_shoes
*/
/// used in Shivas Snowball

/datum/equipment_preset/survivor/clf/cold

Expand Down

0 comments on commit 92f00bd

Please sign in to comment.