shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit685

Browse Source
This commit is contained in:
Ghommie
2020-05-12 20:06:59 +02:00
parent b2a20d5438 0b03958136
commit 7fb96ab0cf
557 changed files with 283936 additions and 4436 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/clothing/under/_under.dm
+6 -3
View File
@@ -6,7 +6,7 @@
block_priority = BLOCK_PRIORITY_UNIFORM
slot_flags = ITEM_SLOT_ICLOTHING
armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
mutantrace_variation = STYLE_DIGITIGRADE
mutantrace_variation = STYLE_DIGITIGRADE|USE_TAUR_CLIP_MASK
var/fitted = FEMALE_UNIFORM_FULL // For use in alternate clothing styles for women
var/has_sensor = HAS_SENSORS // For the crew computer
var/random_sensor = TRUE
@@ -32,7 +32,7 @@
/obj/item/clothing/under/attackby(obj/item/I, mob/user, params)
if((has_sensor == BROKEN_SENSORS) && istype(I, /obj/item/stack/cable_coil))
var/obj/item/stack/cable_coil/C = I
C.use(1)
I.use_tool(src, user, 0, 1)
has_sensor = HAS_SENSORS
to_chat(user,"<span class='notice'>You repair the suit sensors on [src] with [C].</span>")
return 1
@@ -101,7 +101,7 @@
if((flags_inv & HIDEACCESSORY) || (A.flags_inv & HIDEACCESSORY))
return TRUE
accessory_overlay = mutable_appearance('icons/mob/clothing/accessories.dmi', "attached_accessory.icon_state")
accessory_overlay = mutable_appearance('icons/mob/clothing/accessories.dmi', attached_accessory.icon_state)
accessory_overlay.alpha = attached_accessory.alpha
accessory_overlay.color = attached_accessory.color
@@ -263,10 +263,13 @@
fitted = NO_FEMALE_UNIFORM
if(!alt_covers_chest) // for the special snowflake suits that expose the chest when adjusted
body_parts_covered &= ~CHEST
mutantrace_variation &= ~USE_TAUR_CLIP_MASK //How are we supposed to see the uniform otherwise?
else
fitted = initial(fitted)
if(!alt_covers_chest)
body_parts_covered |= CHEST
if(initial(mutantrace_variation) & USE_TAUR_CLIP_MASK)
mutantrace_variation |= USE_TAUR_CLIP_MASK
return adjusted
code/modules/clothing/under/costume.dm
+13 -14
View File
@@ -130,25 +130,27 @@
var/obj/item/clothing/accessory/maidapron/A = new (src)
attach_accessory(A)
/obj/item/clothing/under/costume/singer
desc = "Just looking at this makes you want to sing."
mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON
body_parts_covered = CHEST|GROIN|ARMS
alternate_worn_layer = ABOVE_SHOES_LAYER
can_adjust = FALSE
/obj/item/clothing/under/costume/singer/yellow
name = "yellow performer's outfit"
desc = "Just looking at this makes you want to sing."
icon_state = "ysing"
item_state = "ysing"
body_parts_covered = CHEST|GROIN|ARMS
fitted = NO_FEMALE_UNIFORM
alternate_worn_layer = ABOVE_SHOES_LAYER
can_adjust = FALSE
/obj/item/clothing/under/costume/singer/blue
name = "blue performer's outfit"
desc = "Just looking at this makes you want to sing."
icon_state = "bsing"
item_state = "bsing"
body_parts_covered = CHEST|GROIN|ARMS
alternate_worn_layer = ABOVE_SHOES_LAYER
fitted = FEMALE_UNIFORM_TOP
can_adjust = FALSE
/obj/item/clothing/under/costume/geisha
name = "geisha suit"
@@ -205,7 +207,7 @@
body_parts_covered = CHEST|GROIN|ARMS
fitted = FEMALE_UNIFORM_TOP
can_adjust = FALSE
mutantrace_variation = NONE
mutantrace_variation = USE_TAUR_CLIP_MASK
/obj/item/clothing/under/costume/drfreeze
name = "doctor freeze's jumpsuit"
@@ -213,7 +215,7 @@
icon_state = "drfreeze"
item_state = "drfreeze"
can_adjust = FALSE
mutantrace_variation = NONE
mutantrace_variation = USE_TAUR_CLIP_MASK
/obj/item/clothing/under/costume/lobster
name = "foam lobster suit"
@@ -222,7 +224,7 @@
item_state = "lobster"
fitted = NO_FEMALE_UNIFORM
can_adjust = FALSE
mutantrace_variation = NONE
mutantrace_variation = USE_TAUR_CLIP_MASK
/obj/item/clothing/under/costume/gondola
name = "gondola hide suit"
@@ -248,7 +250,7 @@
icon_state = "christmasmaler"
item_state = "christmasmaler"
can_adjust = FALSE
mutantrace_variation = NONE
mutantrace_variation = USE_TAUR_CLIP_MASK
/obj/item/clothing/under/costume/christmas/green
name = "green christmas suit"
@@ -262,7 +264,7 @@
icon_state = "christmasfemaler"
item_state = "christmasfemaler"
body_parts_covered = CHEST|GROIN
mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON
mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON|USE_TAUR_CLIP_MASK
/obj/item/clothing/under/costume/christmas/croptop/green
name = "green feminine christmas suit"
@@ -287,7 +289,6 @@
item_state = "qipao_white"
body_parts_covered = CHEST|GROIN
can_adjust = FALSE
mutantrace_variation = NONE
/obj/item/clothing/under/costume/qipao/red
name = "Red Qipao"
@@ -296,7 +297,6 @@
item_state = "qipao_red"
body_parts_covered = CHEST|GROIN
can_adjust = FALSE
mutantrace_variation = NONE
/obj/item/clothing/under/costume/cheongsam
name = "Black Cheongsam"
@@ -305,7 +305,7 @@
item_state = "cheong"
body_parts_covered = CHEST|GROIN
can_adjust = FALSE
mutantrace_variation = NONE
mutantrace_variation = USE_TAUR_CLIP_MASK
/obj/item/clothing/under/costume/cheongsam/white
name = "White Cheongsam"
@@ -323,7 +323,6 @@
item_state = "cheongr"
body_parts_covered = CHEST|GROIN
can_adjust = FALSE
mutantrace_variation = NONE
/obj/item/clothing/under/costume/cloud
name = "cloud"
code/modules/clothing/under/jobs/civilian/clown_mime.dm
+3
View File
@@ -30,6 +30,7 @@
item_state = "clown"
fitted = FEMALE_UNIFORM_TOP
can_adjust = FALSE
mutantrace_variation = STYLE_DIGITIGRADE //The clown suit must look funny, no taur alpha masks where possible.
/obj/item/clothing/under/rank/civilian/clown/blue
name = "blue clown suit"
@@ -90,6 +91,7 @@
desc = "A jolly dress, well suited to entertain your master, nuncle."
icon_state = "jester"
can_adjust = FALSE
mutantrace_variation = STYLE_DIGITIGRADE|USE_TAUR_CLIP_MASK
/obj/item/clothing/under/rank/civilian/clown/jester/alt
icon_state = "jester2"
@@ -100,6 +102,7 @@
icon_state = "sexyclown"
item_state = "sexyclown"
can_adjust = FALSE
mutantrace_variation = STYLE_DIGITIGRADE|USE_TAUR_CLIP_MASK
/obj/item/clothing/under/rank/civilian/clown/Initialize()
. = ..()
code/modules/clothing/under/jobs/command.dm
+1 -1
View File
@@ -46,4 +46,4 @@
icon_state = "lewdcap"
item_state = "lewdcap"
can_adjust = FALSE
mutantrace_variation = NONE
mutantrace_variation = USE_TAUR_CLIP_MASK
code/modules/clothing/under/jobs/medical.dm
+1 -1
View File
@@ -22,7 +22,7 @@
icon_state = "cmoturtle"
item_state = "w_suit"
alt_covers_chest = TRUE
mutantrace_variation = NONE
mutantrace_variation = USE_TAUR_CLIP_MASK
/obj/item/clothing/under/rank/medical/geneticist
desc = "It's made of a special fiber that gives special protection against biohazards. It has a genetics rank stripe on it."
code/modules/clothing/under/miscellaneous.dm
+5 -5
View File
@@ -103,7 +103,7 @@
mob_overlay_icon = 'goon/icons/mob/worn_js_rank.dmi'
icon_state = "assistant"
item_state = "gy_suit"
mutantrace_variation = NONE
mutantrace_variation = USE_TAUR_CLIP_MASK
/obj/item/clothing/under/croptop
name = "crop top"
@@ -121,7 +121,7 @@
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 100, "rad" = 0, "fire" = 95, "acid" = 95)
slowdown = 1
body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
mutantrace_variation = NONE
mutantrace_variation = USE_TAUR_CLIP_MASK
can_adjust = FALSE
strip_delay = 80
var/next_extinguish = 0
@@ -196,7 +196,7 @@
icon_state = "squatteroutfit"
item_state = "squatteroutfit"
can_adjust = FALSE
mutantrace_variation = NONE
mutantrace_variation = USE_TAUR_CLIP_MASK
/obj/item/clothing/under/misc/blue_camo
name = "russian blue camo"
@@ -204,7 +204,7 @@
icon_state = "russobluecamo"
item_state = "russobluecamo"
can_adjust = FALSE
mutantrace_variation = NONE
mutantrace_variation = USE_TAUR_CLIP_MASK
/obj/item/clothing/under/misc/keyholesweater
name = "keyhole sweater"
@@ -238,7 +238,7 @@
icon_state = "tssuit"
item_state = "r_suit"
can_adjust = FALSE
mutantrace_variation = NONE
mutantrace_variation = USE_TAUR_CLIP_MASK
/obj/item/clothing/under/misc/poly_shirt
name = "polychromic button-up shirt"
code/modules/clothing/under/pants.dm
+1
View File
@@ -4,6 +4,7 @@
fitted = NO_FEMALE_UNIFORM
can_adjust = FALSE
custom_price = 60
mutantrace_variation = STYLE_DIGITIGRADE //how do they show up on taurs otherwise?
/obj/item/clothing/under/pants/classicjeans
name = "classic jeans"
code/modules/clothing/under/shorts.dm
+1
View File
@@ -5,6 +5,7 @@
body_parts_covered = GROIN
fitted = NO_FEMALE_UNIFORM
can_adjust = FALSE
mutantrace_variation = STYLE_DIGITIGRADE //how do they show up on taurs otherwise?
/obj/item/clothing/under/shorts/red
name = "red athletic shorts"
code/modules/clothing/under/syndicate.dm
+2 -2
View File
@@ -86,7 +86,7 @@
desc = "With a suit lined with this many pockets, you are ready to operate."
icon_state = "syndicate_combat"
can_adjust = FALSE
mutantrace_variation = NONE
mutantrace_variation = USE_TAUR_CLIP_MASK
/obj/item/clothing/under/syndicate/rus_army
name = "advanced military tracksuit"
@@ -105,5 +105,5 @@
has_sensor = NO_SENSORS
armor = list("melee" = 15, "bullet" = 5, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 40)
alt_covers_chest = TRUE
mutantrace_variation = NONE
mutantrace_variation = USE_TAUR_CLIP_MASK