cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 10:21:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

(READY TO MERGE)FIXING GREY SPRITES: THE BEGINNING (#11071)

Browse Source 
* New grey sprites and such

* more shite+ roundabout fix

* More stuff
This commit is contained in:
kolith
2016-08-02 18:32:24 -07:00
committed by clusterfack
parent 314797c959
commit 91a4c966c9
31 changed files with 100 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
code/modules/clothing/glasses/glasses.dm
View File

@@ -4,7 +4,7 @@
desc = "Optical Meson Scanner with prescription lenses."
prescription = 1
eyeprot = -1
species_fit = list(VOX_SHAPED)
species_fit = list(VOX_SHAPED, GREY_SHAPED)
/obj/item/clothing/glasses/science
name = "Science Goggles"
@@ -21,7 +21,7 @@
origin_tech = "magnets=2"
see_invisible = SEE_INVISIBLE_OBSERVER_NOLIGHTING
see_in_dark = 8
species_fit = list(VOX_SHAPED)
species_fit = list(VOX_SHAPED, GREY_SHAPED)
eyeprot = -1
/obj/item/clothing/glasses/eyepatch
@@ -78,7 +78,7 @@
origin_tech = "combat=2"
darkness_view = -1
eyeprot = 1
species_fit = list(VOX_SHAPED)
species_fit = list(VOX_SHAPED, GREY_SHAPED)
/obj/item/clothing/glasses/sunglasses/kick_act(mob/living/carbon/human/H)
H.visible_message("<span class='danger'>[H] stomps on \the [src], crushing them!</span>", "<span class='danger'>You crush \the [src] under your foot.</span>")
@@ -122,7 +122,7 @@
action_button_name = "Toggle Welding Goggles"
var/up = 0
eyeprot = 3
species_fit = list(VOX_SHAPED)
species_fit = list(VOX_SHAPED, GREY_SHAPED)
/obj/item/clothing/glasses/welding/attack_self()
toggle()
@@ -174,7 +174,7 @@
/obj/item/clothing/glasses/sunglasses/prescription
name = "prescription sunglasses"
prescription = 1
species_fit = list(VOX_SHAPED)
species_fit = list(VOX_SHAPED, GREY_SHAPED)
/obj/item/clothing/glasses/sunglasses/big
desc = "Strangely ancient technology used to help provide rudimentary eye cover. Larger than average enhanced shielding blocks many flashes."
@@ -188,7 +188,7 @@
desc = "Sunglasses with a HUD."
icon_state = "sunhud"
var/obj/item/clothing/glasses/hud/security/hud = null
species_fit = list(VOX_SHAPED)
species_fit = list(VOX_SHAPED, GREY_SHAPED)
New()
..()

1
code/modules/clothing/glasses/hud.dm
View File

@@ -18,6 +18,7 @@
name = "Health Scanner HUD"
desc = "A heads-up display that scans the humanoid carbon lifeforms in view and provides accurate data about their health status."
icon_state = "healthhud"
species_fit = list(GREY_SHAPED)
/obj/item/clothing/glasses/hud/health/process_hud(var/mob/M)
if(harm_labeled < min_harm_label)

1
code/modules/clothing/glasses/scanners.dm
View File

@@ -45,6 +45,7 @@
eyeprot = -1
see_invisible = SEE_INVISIBLE_MINIMUM
action_button_name = "Toggle Meson Scanner"
species_fit = list(GREY_SHAPED)
/obj/item/clothing/glasses/scanner/meson/enable(var/mob/C)
eyeprot = 2

2
code/modules/clothing/head/helmet.dm
View File

@@ -8,6 +8,7 @@
heat_conductivity = HELMET_HEAT_CONDUCTIVITY
max_heat_protection_temperature = HELMET_MAX_HEAT_PROTECTION_TEMPERATURE
siemens_coefficient = 0.7
species_fit = list(GREY_SHAPED)
/obj/item/clothing/head/helmet/siren
name = "siren helmet"
@@ -18,6 +19,7 @@
light_color = LIGHT_COLOR_RED
action_button_name = "Activate Siren"
var/spamcheck = 0
species_fit = list(GREY_SHAPED)
/obj/item/clothing/head/helmet/siren/attack_self(mob/user)
if(spamcheck)

2
code/modules/clothing/head/tactical.dm
View File

@@ -108,7 +108,7 @@ obj/item/clothing/head/helmet/tactical/attack_self(mob/user)
item_state = "swat"
armor = list(melee = 80, bullet = 60, laser = 50,energy = 25, bomb = 50, bio = 10, rad = 0)
heat_conductivity = INS_HELMET_HEAT_CONDUCTIVITY
species_fit = list(VOX_SHAPED)
species_fit = list(VOX_SHAPED, GREY_SHAPED)
pressure_resistance = 200 * ONE_ATMOSPHERE
siemens_coefficient = 0.5
eyeprot = 1

6
code/modules/clothing/masks/boxing.dm
View File

@@ -7,7 +7,7 @@
body_parts_covered = HEAD|EARS|EYES
w_class = W_CLASS_SMALL
siemens_coefficient = 3.0
species_fit = list(VOX_SHAPED)
species_fit = list(VOX_SHAPED, GREY_SHAPED)
/obj/item/clothing/mask/luchador/treat_mask_speech(var/datum/speech/speech)
var/message=speech.message
@@ -37,11 +37,11 @@
desc = "Worn by robust fighters who uphold justice and fight honorably."
icon_state = "luchador"
item_state = "luchador"
species_fit = list(VOX_SHAPED)
species_fit = list(VOX_SHAPED, GREY_SHAPED)
/obj/item/clothing/mask/luchador/rudos
name = "Rudos Mask"
desc = "Worn by robust fighters who are willing to do anything to win."
icon_state = "luchar"
item_state = "luchar"
species_fit = list(VOX_SHAPED)
species_fit = list(VOX_SHAPED, GREY_SHAPED)

2
code/modules/clothing/masks/breath.dm
View File

@@ -7,7 +7,7 @@
w_class = W_CLASS_SMALL
gas_transfer_coefficient = 0.10
permeability_coefficient = 0.50
species_fit = list(VOX_SHAPED)
species_fit = list(VOX_SHAPED, GREY_SHAPED)
can_flip = 1

6
code/modules/clothing/masks/gasmask.dm
View File

@@ -10,7 +10,7 @@
gas_transfer_coefficient = 0.01
permeability_coefficient = 0.01
siemens_coefficient = 0.9
species_fit = list(VOX_SHAPED)
species_fit = list(VOX_SHAPED, GREY_SHAPED)
body_parts_covered = FACE
pressure_resistance = ONE_ATMOSPHERE
var/canstage = 1
@@ -144,7 +144,7 @@
desc = "A true prankster's facial attire. A clown is incomplete without his wig and mask."
icon_state = "clown"
item_state = "clown_hat"
species_fit = list(VOX_SHAPED)
species_fit = list(VOX_SHAPED, GREY_SHAPED)
can_flip = 0
canstage = 0
@@ -187,7 +187,7 @@
desc = "The traditional mime's mask. It has an eerie facial posture."
icon_state = "mime"
item_state = "mime"
species_fit = list(VOX_SHAPED)
species_fit = list(VOX_SHAPED, GREY_SHAPED)
can_flip = 0
canstage = 0
var/muted = 0

4
code/modules/clothing/masks/miscellaneous.dm
View File

@@ -29,7 +29,7 @@
gas_transfer_coefficient = 0.90
permeability_coefficient = 0.01
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 25, rad = 0)
species_fit = list(VOX_SHAPED)
species_fit = list(VOX_SHAPED, GREY_SHAPED)
/obj/item/clothing/mask/fakemoustache
name = "fake moustache"
@@ -75,7 +75,7 @@
flags = FPRINT
body_parts_covered = FACE
w_class = W_CLASS_SMALL
species_fit = list(VOX_SHAPED)
species_fit = list(VOX_SHAPED, GREY_SHAPED)
/obj/item/clothing/mask/pig
name = "pig mask"

6
code/modules/clothing/spacesuits/ert.dm
View File

@@ -8,6 +8,7 @@
max_heat_protection_temperature = FIRE_HELMET_MAX_HEAT_PROTECTION_TEMPERATURE
flags = FPRINT | PLASMAGUARD
var/obj/machinery/camera/camera
species_fit = list(GREY_SHAPED)
species_restricted = list("exclude",VOX_SHAPED)
pressure_resistance = 200 * ONE_ATMOSPHERE
eyeprot = 3
@@ -43,6 +44,7 @@
/obj/item/weapon/gun/energy/taser, /obj/item/weapon/melee/baton, /obj/item/weapon/gun/energy/gun)
siemens_coefficient = 0.6
max_heat_protection_temperature = FIRESUIT_MAX_HEAT_PROTECTION_TEMPERATURE
species_fit = list(GREY_SHAPED)
species_restricted = list("exclude",VOX_SHAPED)
//Commander
@@ -51,6 +53,7 @@
desc = "A helmet worn by the commander of a Nanotrasen Emergency Response Team. Armoured, space ready and fire resistant."
icon_state = "ert_commander"
item_state = "helm-command"
species_fit = list(GREY_SHAPED)
species_restricted = list("exclude",VOX_SHAPED)
/obj/item/clothing/suit/space/ert/commander
@@ -66,6 +69,7 @@
desc = "A helmet worn by the security members of a Nanotrasen Emergency Response Team. Armoured, space ready and fire resistant."
icon_state = "ert_security"
item_state = "syndicate-helm-black-red"
species_fit = list(GREY_SHAPED)
species_restricted = list("exclude",VOX_SHAPED)
/obj/item/clothing/suit/space/ert/security
@@ -79,6 +83,7 @@
name = "emergency response team engineer helmet"
desc = "A helmet worn by the engineering members of a Nanotrasen Emergency Response Team. Armoured, space ready and fire resistant. This one is radiation resistant as well."
icon_state = "ert_engineer"
species_fit = list(GREY_SHAPED)
species_restricted = list("exclude",VOX_SHAPED)
armor = list(melee = 50, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 100, rad = 100)
@@ -93,6 +98,7 @@
name = "emergency response team medical helmet"
desc = "A helmet worn by the medical members of a Nanotrasen Emergency Response Team. Armoured, space ready and fire resistant."
icon_state = "ert_medical"
species_fit = list(GREY_SHAPED)
species_restricted = list("exclude",VOX_SHAPED)
/obj/item/clothing/suit/space/ert/medical

1
code/modules/clothing/spacesuits/miscellaneous.dm
View File

@@ -6,6 +6,7 @@
desc = "A paramedic space helmet. Used in the recovery of bodies from space."
icon_state = "paramedic-eva-helmet"
item_state = "paramedic-eva-helmet"
species_fit = list(GREY_SHAPED)
species_restricted = list("exclude",VOX_SHAPED)
/obj/item/clothing/suit/space/paramedic

33
code/modules/clothing/spacesuits/rig.dm
View File

@@ -15,6 +15,7 @@
max_heat_protection_temperature = SPACE_SUIT_MAX_HEAT_PROTECTION_TEMPERATURE
pressure_resistance = 200 * ONE_ATMOSPHERE
eyeprot = 3
species_fit = list(GREY_SHAPED)
species_restricted = list("exclude",VOX_SHAPED)
/obj/item/clothing/head/helmet/space/rig/New()
@@ -32,6 +33,8 @@
_color = "ghetto"
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
eyeprot = 0
species_fit = list(GREY_SHAPED)
/obj/item/clothing/head/helmet/space/rig/examine(mob/user)
@@ -86,19 +89,21 @@
icon_state = "rig-engineering"
item_state = "eng_hardsuit"
slowdown = 1
species_fit = list(GREY_SHAPED)
species_restricted = list("exclude",VOX_SHAPED)
armor = list(melee = 40, bullet = 5, laser = 20,energy = 5, bomb = 35, bio = 100, rad = 80)
allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/weapon/storage/bag/ore,/obj/item/device/t_scanner,/obj/item/weapon/pickaxe, /obj/item/device/rcd, /obj/item/weapon/wrench/socket)
max_heat_protection_temperature = SPACE_SUIT_MAX_HEAT_PROTECTION_TEMPERATURE
pressure_resistance = 200 * ONE_ATMOSPHERE
/obj/item/clothing/suit/space/rig/ghettorig
name = "jury-rigged firesuit"
icon_state = "ghettorig"
item_state = "ghettorig"
desc = "Let me give it to you straight like a pear cider made from 100% pears, this space suit isn't particularly good"
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
species_fit = list(GREY_SHAPED)
//Chief Engineer's rig
/obj/item/clothing/head/helmet/space/rig/elite
@@ -107,6 +112,7 @@
icon_state = "rig0-white"
item_state = "ce_helm"
_color = "white"
species_fit = list(GREY_SHAPED)
species_restricted = list("exclude",VOX_SHAPED)
max_heat_protection_temperature = FIRE_HELMET_MAX_HEAT_PROTECTION_TEMPERATURE
flags = FPRINT | PLASMAGUARD
@@ -114,6 +120,7 @@
/obj/item/clothing/suit/space/rig/elite
icon_state = "rig-white"
name = "advanced hardsuit"
species_fit = list(GREY_SHAPED)
species_restricted = list("exclude",VOX_SHAPED)
desc = "An advanced suit that protects against hazardous, low pressure environments. Shines with a high polish."
item_state = "ce_hardsuit"
@@ -128,6 +135,7 @@
icon_state = "rig0-mining"
item_state = "mining_helm"
_color = "mining"
species_fit = list(GREY_SHAPED)
species_restricted = list("exclude",VOX_SHAPED)
pressure_resistance = 40 * ONE_ATMOSPHERE
@@ -146,7 +154,7 @@
desc = "An advanced helmet designed for work in special operations. Property of Gorlex Marauders."
icon_state = "rig0-syndi"
item_state = "syndie_helm"
species_fit = list(VOX_SHAPED)
species_fit = list(VOX_SHAPED, GREY_SHAPED)
_color = "syndi"
armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 35, bio = 100, rad = 60)
action_button_name = "Toggle Helmet Camera" //This helmet does not have a light, but we'll do as if
@@ -176,6 +184,7 @@
name = "blood-red hardsuit"
desc = "An advanced suit that protects against injuries during special operations. Property of Gorlex Marauders."
item_state = "syndie_hardsuit"
species_fit = list(GREY_SHAPED)
species_fit = list(VOX_SHAPED)
slowdown = 1
w_class = W_CLASS_MEDIUM
@@ -193,6 +202,7 @@
icon_state = "rig0-wiz"
item_state = "wiz_helm"
_color = "wiz"
species_fit = list(GREY_SHAPED)
species_restricted = list("exclude",VOX_SHAPED)
unacidable = 1 //No longer shall our kind be foiled by lone chemists with spray bottles!
armor = list(melee = 40, bullet = 20, laser = 20,energy = 20, bomb = 35, bio = 100, rad = 60)
@@ -210,6 +220,7 @@
slowdown = 1
w_class = W_CLASS_MEDIUM
unacidable = 1
species_fit = list(GREY_SHAPED)
species_restricted = list("exclude",VOX_SHAPED)
armor = list(melee = 40, bullet = 20, laser = 20,energy = 20, bomb = 35, bio = 100, rad = 60)
siemens_coefficient = 0.7
@@ -225,6 +236,7 @@
icon_state = "rig0-medical"
item_state = "medical_helm"
_color = "medical"
species_fit = list(GREY_SHAPED)
species_restricted = list("exclude",VOX_SHAPED)
pressure_resistance = 40 * ONE_ATMOSPHERE
@@ -233,6 +245,7 @@
name = "medical hardsuit"
desc = "A special suit that protects against hazardous, low pressure environments. Has minor radiation shielding."
item_state = "medical_hardsuit"
species_fit = list(GREY_SHAPED)
species_restricted = list("exclude",VOX_SHAPED)
allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/weapon/storage/firstaid,/obj/item/device/healthanalyzer,/obj/item/stack/medical)
pressure_resistance = 40 * ONE_ATMOSPHERE
@@ -245,6 +258,7 @@
icon_state = "rig0-sec"
item_state = "sec_helm"
_color = "sec"
species_fit = list(GREY_SHAPED)
species_restricted = list("exclude",VOX_SHAPED)
armor = list(melee = 60, bullet = 10, laser = 30, energy = 5, bomb = 45, bio = 100, rad = 10)
siemens_coefficient = 0.7
@@ -255,6 +269,7 @@
name = "security hardsuit"
desc = "A special suit that protects against hazardous low pressure environments. Has an additional layer of armor."
item_state = "sec_hardsuit"
species_fit = list(GREY_SHAPED)
species_restricted = list("exclude",VOX_SHAPED)
armor = list(melee = 60, bullet = 10, laser = 30, energy = 5, bomb = 45, bio = 100, rad = 10)
allowed = list(/obj/item/weapon/gun,/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/weapon/melee/baton)
@@ -282,6 +297,7 @@
icon_state = "rig0-atmos"
item_state = "atmos_helm"
_color = "atmos"
species_fit = list(GREY_SHAPED)
species_restricted = list("exclude",VOX_SHAPED)
flags = FPRINT | PLASMAGUARD
armor = list(melee = 40, bullet = 0, laser = 0, energy = 0, bomb = 25, bio = 100, rad = 0)
@@ -294,6 +310,7 @@
item_state = "atmos_hardsuit"
species_restricted = list("exclude",VOX_SHAPED)
flags = FPRINT | PLASMAGUARD
species_fit = list(GREY_SHAPED)
armor = list(melee = 40, bullet = 0, laser = 0, energy = 0, bomb = 25, bio = 100, rad = 0)
max_heat_protection_temperature = FIRESUIT_MAX_HEAT_PROTECTION_TEMPERATURE
@@ -305,6 +322,7 @@
icon_state = "rig0-atmos_gold"
item_state = "atmos_gold_helm"
_color = "atmos_gold"
species_fit = list(GREY_SHAPED)
species_restricted = list("exclude",VOX_SHAPED)
no_light = 1
@@ -317,6 +335,7 @@
name = "atmos hardsuit"
item_state = "atmos_gold_hardsuit"
slowdown = 2
species_fit = list(GREY_SHAPED)
armor = list(melee = 30, bullet = 5, laser = 40,energy = 5, bomb = 35, bio = 100, rad = 60)
allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/weapon/storage/backpack/satchel_norm,/obj/item/device/t_scanner,/obj/item/weapon/pickaxe, /obj/item/device/rcd, /obj/item/weapon/extinguisher, /obj/item/weapon/)
@@ -326,6 +345,7 @@
desc = "This is the face of das vaterland's top elite. Gas or energy are your only escapes."
item_state = "rig0-nazi"
icon_state = "rig0-nazi"
species_fit = list(GREY_SHAPED)
species_restricted = list("exclude",VOX_SHAPED)//GAS THE VOX
armor = list(melee = 40, bullet = 30, laser = 30, energy = 15, bomb = 35, bio = 100, rad = 20)
_color = "nazi"
@@ -337,6 +357,7 @@
item_state = "rig-nazi"
icon_state = "rig-nazi"
slowdown = 1
species_fit = list(GREY_SHAPED)
species_restricted = list("exclude",VOX_SHAPED)//GAS THE VOX
armor = list(melee = 40, bullet = 30, laser = 30, energy = 15, bomb = 35, bio = 100, rad = 20)
allowed = list(/obj/item/weapon/gun,/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/weapon/melee/)
@@ -347,6 +368,7 @@
desc = "Crafted with the pride of the proletariat. The vengeful gaze of the visor roots out all fascists and capitalists."
item_state = "rig0-soviet"
icon_state = "rig0-soviet"
species_fit = list(GREY_SHAPED)
species_restricted = list("exclude",VOX_SHAPED)//HET
armor = list(melee = 40, bullet = 30, laser = 30, energy = 15, bomb = 35, bio = 100, rad = 20)
_color = "soviet"
@@ -358,6 +380,7 @@
item_state = "rig-soviet"
icon_state = "rig-soviet"
slowdown = 1
species_fit = list(GREY_SHAPED)
species_restricted = list("exclude",VOX_SHAPED)//HET
armor = list(melee = 40, bullet = 30, laser = 30, energy = 15, bomb = 35, bio = 100, rad = 20)
allowed = list(/obj/item/weapon/gun,/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/weapon/melee/)
@@ -373,6 +396,7 @@
armor = list(melee = 65, bullet = 55, laser = 35,energy = 20, bomb = 40, bio = 100, rad = 60)
max_heat_protection_temperature = FIRE_HELMET_MAX_HEAT_PROTECTION_TEMPERATURE
siemens_coefficient = 0.2
species_fit = list(GREY_SHAPED)
species_restricted = list("exclude",VOX_SHAPED)
_color = "deathsquad"
flags = FPRINT | PLASMAGUARD
@@ -386,6 +410,7 @@
armor = list(melee = 80, bullet = 60, laser = 50,energy = 25, bomb = 60, bio = 100, rad = 60)
max_heat_protection_temperature = FIRESUIT_MAX_HEAT_PROTECTION_TEMPERATURE
siemens_coefficient = 0.5
species_fit = list(GREY_SHAPED)
species_restricted = list("exclude",VOX_SHAPED)
flags = FPRINT | PLASMAGUARD
@@ -399,6 +424,7 @@
armor = list(melee = 60, bullet = 40, laser = 40,energy = 30, bomb = 50, bio = 100, rad = 60)
max_heat_protection_temperature = FIRE_HELMET_MAX_HEAT_PROTECTION_TEMPERATURE
siemens_coefficient = 0.2
species_fit = list(GREY_SHAPED)
species_restricted = list("exclude",VOX_SHAPED)
_color = "knight"
flags = FPRINT | PLASMAGUARD
@@ -413,6 +439,7 @@
armor = list(melee = 60, bullet = 40, laser = 40,energy = 30, bomb = 50, bio = 100, rad = 60)
max_heat_protection_temperature = FIRESUIT_MAX_HEAT_PROTECTION_TEMPERATURE
siemens_coefficient = 0.5
species_fit = list(GREY_SHAPED)
species_restricted = list("exclude",VOX_SHAPED)
flags = FPRINT | PLASMAGUARD
@@ -423,6 +450,7 @@
item_state = "rig0-blackknight"
armor = list(melee = 70, bullet = 65, laser = 50,energy = 25, bomb = 60, bio = 100, rad = 60)
_color="blackknight"
species_fit = list(GREY_SHAPED)
/obj/item/clothing/suit/space/rig/knight/black
name = "Black Knight's armour"
@@ -430,6 +458,7 @@
icon_state = "rig-blackknight"
item_state = "rig-blackknight"
armor = list(melee = 70, bullet = 65, laser = 50,energy = 25, bomb = 60, bio = 100, rad = 60)
species_fit = list(GREY_SHAPED)
/obj/item/clothing/head/helmet/space/rig/knight/solaire
name = "Solar helm"

1
code/modules/clothing/spacesuits/syndi.dm
View File

@@ -3,6 +3,7 @@
name = "red space helmet"
icon_state = "syndicate"
item_state = "syndicate"
species_fit = list(GREY_SHAPED)
species_restricted = list("exclude",VOX_SHAPED)
desc = "Has a tag on it: Totally not property of a hostile corporation, honest!"
armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 30, rad = 30)

2
code/modules/clothing/spacesuits/void.dm
View File

@@ -3,10 +3,12 @@
/obj/item/clothing/head/helmet/space/nasavoid
name = "NASA Void Helmet"
desc = "A high tech, NASA Centcom branch designed, dark red space suit helmet. Used for AI satellite maintenance."
species_fit = list(GREY_SHAPED)
species_restricted = list("exclude",VOX_SHAPED)
icon_state = "void"
item_state = "void"
/obj/item/clothing/suit/space/nasavoid
name = "NASA Voidsuit"
icon_state = "void"

2
code/modules/clothing/suits/jobs.dm
View File

@@ -10,7 +10,7 @@
item_state = "paramedic-vest"
allowed = list(/obj/item/device/analyzer,/obj/item/stack/medical,/obj/item/weapon/dnainjector,/obj/item/weapon/reagent_containers/dropper,/obj/item/weapon/reagent_containers/syringe,/obj/item/weapon/reagent_containers/hypospray,/obj/item/device/healthanalyzer,/obj/item/device/flashlight/pen,/obj/item/weapon/tank/emergency_oxygen,/obj/item/weapon/tank/emergency_nitrogen,/obj/item/device/radio,/obj/item/device/gps)
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 10, rad = 10)
species_fit = list(VOX_SHAPED)
species_fit = list(VOX_SHAPED, GREY_SHAPED)
//Botonist
/obj/item/clothing/suit/apron

14
code/modules/clothing/suits/labcoat.dm
View File

@@ -8,7 +8,7 @@
blood_overlay_type = "coat"
allowed = list(/obj/item/device/analyzer,/obj/item/stack/medical,/obj/item/weapon/dnainjector,/obj/item/weapon/reagent_containers/dropper,/obj/item/weapon/reagent_containers/syringe,/obj/item/weapon/reagent_containers/hypospray,/obj/item/device/healthanalyzer,/obj/item/device/flashlight/pen)
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 50, rad = 0)
species_fit = list(VOX_SHAPED)
species_fit = list(VOX_SHAPED, GREY_SHAPED)
@@ -45,7 +45,7 @@
desc = "Bluer than the standard model."
base_icon_state = "labcoat_cmo"
item_state = "labcoat_cmo"
species_fit = list(VOX_SHAPED)
species_fit = list(VOX_SHAPED, GREY_SHAPED)
/obj/item/clothing/suit/storage/labcoat/mad
name = "The Mad's labcoat"
@@ -58,30 +58,30 @@
name = "Geneticist Labcoat"
desc = "A suit that protects against minor chemical spills. Has a blue stripe on the shoulder."
base_icon_state = "labcoat_gen"
species_fit = list(VOX_SHAPED)
species_fit = list(VOX_SHAPED, GREY_SHAPED)
/obj/item/clothing/suit/storage/labcoat/chemist
name = "Chemist Labcoat"
desc = "A suit that protects against minor chemical spills. Has an orange stripe on the shoulder."
base_icon_state = "labcoat_chem"
species_fit = list(VOX_SHAPED)
species_fit = list(VOX_SHAPED, GREY_SHAPED)
/obj/item/clothing/suit/storage/labcoat/virologist
name = "Virologist Labcoat"
desc = "A suit that protects against minor chemical spills. Offers slightly more protection against biohazards than the standard model. Has a green stripe on the shoulder."
base_icon_state = "labcoat_vir"
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 60, rad = 0)
species_fit = list(VOX_SHAPED)
species_fit = list(VOX_SHAPED, GREY_SHAPED)
/obj/item/clothing/suit/storage/labcoat/science
name = "Scientist Labcoat"
desc = "A suit that protects against minor chemical spills. Has a purple stripe on the shoulder."
base_icon_state = "labcoat_tox"
species_fit = list(VOX_SHAPED)
species_fit = list(VOX_SHAPED, GREY_SHAPED)
/obj/item/clothing/suit/storage/labcoat/oncologist
name = "Oncologist Labcoat"
desc = "A suit that protects against minor radiation exposure. Offers slightly more protection against radiation than the standard model. Has a black stripe on the shoulder."
base_icon_state = "labcoat_onc"
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 60)
species_fit = list(VOX_SHAPED)
species_fit = list(VOX_SHAPED, GREY_SHAPED)

2
code/modules/clothing/under/color.dm
View File

@@ -33,7 +33,7 @@
item_state = "gy_suit"
_color = "grey"
flags = FPRINT | ONESIZEFITSALL
species_fit = list(VOX_SHAPED)
species_fit = list(VOX_SHAPED, GREY_SHAPED)
/obj/item/clothing/under/color/orange
name = "orange jumpsuit"

2
code/modules/clothing/under/jobs/civilian.dm
View File

@@ -17,7 +17,7 @@
item_state = "caparmor"
_color = "captain"
flags = FPRINT | ONESIZEFITSALL
species_fit = list(VOX_SHAPED)
species_fit = list(VOX_SHAPED, GREY_SHAPED)
/obj/item/clothing/under/rank/cargo

2
code/modules/clothing/under/jobs/engineering.dm
View File

@@ -16,7 +16,7 @@
item_state = "atmos_suit"
_color = "atmos"
flags = FPRINT | ONESIZEFITSALL
species_fit = list(VOX_SHAPED)
species_fit = list(VOX_SHAPED, GREY_SHAPED)
/obj/item/clothing/under/rank/engineer
desc = "It's an orange high visibility jumpsuit worn by engineers. It has minor radiation shielding."

14
code/modules/clothing/under/jobs/medsci.dm
View File

@@ -31,7 +31,7 @@
permeability_coefficient = 0.50
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0)
flags = FPRINT | ONESIZEFITSALL
species_fit = list(VOX_SHAPED)
species_fit = list(VOX_SHAPED, GREY_SHAPED)
/obj/item/clothing/under/rank/pharma
desc = "It's made of a special fiber that gives special protection against biohazards. It has a pharmacist rank stripe on it."
@@ -95,7 +95,7 @@
permeability_coefficient = 0.50
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0)
flags = FPRINT | ONESIZEFITSALL
species_fit = list(VOX_SHAPED)
species_fit = list(VOX_SHAPED, GREY_SHAPED)
/obj/item/clothing/under/rank/geneticist
desc = "It's made of a special fiber that gives special protection against biohazards. It has a genetics rank stripe on it."
@@ -106,7 +106,7 @@
permeability_coefficient = 0.50
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0)
flags = FPRINT | ONESIZEFITSALL
species_fit = list(VOX_SHAPED)
species_fit = list(VOX_SHAPED, GREY_SHAPED)
/obj/item/clothing/under/rank/virologist
desc = "It's made of a special fiber that gives special protection against biohazards. It has a virologist rank stripe on it."
@@ -117,7 +117,7 @@
permeability_coefficient = 0.50
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0)
flags = FPRINT | ONESIZEFITSALL
species_fit = list(VOX_SHAPED)
species_fit = list(VOX_SHAPED, GREY_SHAPED)
/obj/item/clothing/under/rank/nursesuit
desc = "It's a jumpsuit commonly worn by nursing staff in the medical department."
@@ -169,7 +169,7 @@
icon_state = "scrubsblue"
_color = "scrubsblue"
flags = FPRINT | ONESIZEFITSALL
species_fit = list(VOX_SHAPED)
species_fit = list(VOX_SHAPED, GREY_SHAPED)
/obj/item/clothing/under/rank/medical/green
name = "medical scrubs"
@@ -177,7 +177,7 @@
icon_state = "scrubsgreen"
_color = "scrubsgreen"
flags = FPRINT | ONESIZEFITSALL
species_fit = list(VOX_SHAPED)
species_fit = list(VOX_SHAPED, GREY_SHAPED)
/obj/item/clothing/under/rank/medical/purple
name = "medical scrubs"
@@ -185,7 +185,7 @@
icon_state = "scrubspurple"
_color = "scrubspurple"
flags = FPRINT | ONESIZEFITSALL
species_fit = list(VOX_SHAPED)
species_fit = list(VOX_SHAPED, GREY_SHAPED)
//paramedic
/obj/item/clothing/under/rank/medical/paramedic

2
code/modules/clothing/under/jobs/security.dm
View File

@@ -28,7 +28,7 @@
armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
flags = FPRINT | ONESIZEFITSALL
siemens_coefficient = 0.9
species_fit = list(VOX_SHAPED)
species_fit = list(VOX_SHAPED, GREY_SHAPED)
/obj/item/clothing/under/rank/security/sneaksuit
name = "sneaking suit"

15
code/modules/mob/living/carbon/species.dm
View File

@@ -447,12 +447,25 @@ var/global/list/whitelisted_species = list("Human")
primitive = /mob/living/carbon/monkey // TODO
flags = IS_WHITELISTED | HAS_LIPS | HAS_UNDERWEAR | CAN_BE_FAT
flags = IS_WHITELISTED | HAS_LIPS | CAN_BE_FAT
// Both must be set or it's only a 45% chance of manifesting.
default_mutations=list(M_REMOTE_TALK)
default_block_names=list("REMOTETALK")
//PLEASE IF YOU MAKE A NEW RACE, KEEP IN MIND PEOPLE WILL PROBABLY MAKE UNIFORM SPRITES.
uniform_icons = 'icons/mob/species/grey/uniform.dmi'
// fat_uniform_icons = 'icons/mob/uniform_fat.dmi'
// gloves_icons = 'icons/mob/gloves.dmi'
glasses_icons = 'icons/mob/species/grey/eyes.dmi'
// ears_icons = 'icons/mob/ears.dmi'
// shoes_icons = 'icons/mob/shoes.dmi'
head_icons = 'icons/mob/species/grey/head.dmi'
// belt_icons = 'icons/mob/belt.dmi'
wear_suit_icons = 'icons/mob/species/grey/suit.dmi'
wear_mask_icons = 'icons/mob/species/grey/masks.dmi'
// back_icons = 'icons/mob/back.dmi'
has_mutant_race = 0
has_organ = list(