Skip to content

Commit

Permalink
cit ports
Browse files Browse the repository at this point in the history
  • Loading branch information
Risquu committed Feb 4, 2021
1 parent 5b12865 commit 458b4dc
Show file tree
Hide file tree
Showing 4 changed files with 37 additions and 2 deletions.
2 changes: 1 addition & 1 deletion code/modules/integrated_electronics/subtypes/weaponized.dm
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
spawn_flags = IC_SPAWN_RESEARCH
action_flags = IC_ACTION_COMBAT
power_draw_per_use = 0
ext_cooldown = 1
ext_cooldown = 4
var/mode = FALSE

var/stun_projectile = null //stun mode projectile type
Expand Down
36 changes: 36 additions & 0 deletions code/modules/mob/dead/new_player/sprite_accessories/hair_head.dm
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@
name = "Bald"
icon_state = "bald"

/datum/sprite_accessory/hair/adhara
name = "Adhara"
icon_state = "hair_adhara"

/datum/sprite_accessory/hair/afro
name = "Afro"
icon_state = "hair_afro"
Expand All @@ -29,6 +33,10 @@
name = "Amazon"
icon_state = "amazon"

/datum/sprite_accessory/hair/anita
name = "Anita"
icon_state = "hair_anita"

/datum/sprite_accessory/hair/antenna
name = "Ahoge"
icon_state = "hair_antenna"
Expand Down Expand Up @@ -69,6 +77,10 @@
name = "Beehive 2"
icon_state = "hair_beehive2"

/datum/sprite_accessory/hair/belle
name = "Belle"
icon_state = "hair_belle"

/datum/sprite_accessory/hair/bigflattop
name = "Big Flat Top"
icon_state = "hair_bigflattop"
Expand Down Expand Up @@ -401,6 +413,10 @@
name = "Hitop"
icon_state = "hair_hitop"

/datum/sprite_accessory/hair/inkling
name = "Inkling"
icon_state = "hair_inkling"

/datum/sprite_accessory/hair/jade
name = "Jade"
icon_state = "hair_jade"
Expand All @@ -421,6 +437,10 @@
name = "Keanu"
icon_state = "hair_keanu"

/datum/sprite_accessory/hair/kleeia
name = "Kleeia"
icon_state = "hair_kleeia"

/datum/sprite_accessory/hair/kusangi
name = "Kusanagi"
icon_state = "hair_kusanagi"
Expand Down Expand Up @@ -497,6 +517,10 @@
name = "Mulder"
icon_state = "hair_mulder"

/datum/sprite_accessory/hair/newyou
name = "New You"
icon_state = "hair_newyou"

/datum/sprite_accessory/hair/nia
name = "Nia"
icon_state = "hair_nia"
Expand Down Expand Up @@ -628,6 +652,10 @@
name = "Ponytail (Spiky)"
icon_state = "hair_spikyponytail"

/datum/sprite_accessory/hair/supernova
name = "Supernova"
icon_state = "hair_supernova"

/datum/sprite_accessory/hair/poofy
name = "Poofy"
icon_state = "hair_poofy"
Expand Down Expand Up @@ -796,6 +824,10 @@
name = "Trimmed (Flat)"
icon_state = "hair_trimflat"

/datum/sprite_accessory/hair/twincurls
name = "Twincurls"
icon_state = "hair_twincurls"

/datum/sprite_accessory/hair/twintails
name = "Twintails"
icon_state = "hair_twintail"
Expand Down Expand Up @@ -840,6 +872,10 @@
name = "Very Short Over Eye (Alt)"
icon_state = "hair_veryshortovereyealternate"

/datum/sprite_accessory/hair/vivi
name = "Vivi"
icon_state = "hair_vivi"

/datum/sprite_accessory/hair/volaju
name = "Volaju"
icon_state = "hair_volaju"
Expand Down
Binary file modified icons/mob/human_face.dmi
Binary file not shown.
1 change: 0 additions & 1 deletion strings/traumas.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@
"I think I got stung by a caesar door.",
"No, YOU are.",
"The Centurion is kinda hot.",
"Xarnata?",
"...",
"KRISTOPHER HIRSCH IS NOT MY CHIEF RANGER!!",
"I don't like sand... it's coarse, it's rough, it's irritating and it gets everywhere...",
Expand Down

0 comments on commit 458b4dc

Please sign in to comment.