Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Asher Suit #42

Open
wants to merge 1 commit into
base: master220
Choose a base branch
from
Open

Asher Suit #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions code/modules/clothing/under/miscellaneous.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -379,8 +379,12 @@
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
resistance_flags = NONE

/obj/item/clothing/under/gladiator/ash_walker
desc = "This gladiator uniform appears to be covered in ash and fairly dated."
/obj/item/clothing/under/ash_walker
name = "ashwalker uniform"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
icon_state = "asher"
item_state = "asher"
item_color = "asher"
has_sensor = FALSE

//dress
Expand Down
2 changes: 1 addition & 1 deletion code/modules/mob/living/simple_animal/hostile/mining/hivelord.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -357,7 +357,7 @@
l_pocket = pickweight(list(/obj/item/stack/spacecash/c1000 = 7, /obj/item/reagent_containers/hypospray/autoinjector/survival = 2, /obj/item/borg/upgrade/modkit/cooldown = 1 ))
if("Ashwalker")
mob_species = /datum/species/unathi/ashwalker
uniform = /obj/item/clothing/under/gladiator/ash_walker
uniform = /obj/item/clothing/under/ash_walker
if(prob(95))
head = /obj/item/clothing/head/helmet/gladiator
else
Expand Down
3 changes: 1 addition & 2 deletions code/modules/ruins/lavalandruin_code/ash_walker_den.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,5 +86,4 @@

/datum/outfit/ashwalker
name ="Ashwalker"
head = /obj/item/clothing/head/helmet/gladiator
uniform = /obj/item/clothing/under/gladiator/ash_walker
uniform = /obj/item/clothing/under/ash_walker
Binary file modified icons/mob/uniform.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified icons/obj/clothing/uniforms.dmi
View file
Open in desktop
Binary file not shown.