cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-24 21:40:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Loadout fix and virus immunity additions (#1804)

Browse Source 
-changed some things on the tweak path loadout to avoid runtimes
-fixed some species being affected by virus when they should be immune to them
-fixed being able to miss when firing point blank
-tweaks a bit more the corporate safe contents
-moves some clothing objects to the proper place and fixes some names
This commit is contained in:
Alberyk
2017-02-24 19:12:16 +02:00
committed by skull132
parent 9a2445dc69
commit 54b64c3688
27 changed files with 159 additions and 212 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference_setup/loadout/gear_tweaks.dm
+17 -48
View File
@@ -14,36 +14,7 @@
return
/*
Color adjustment
*/
var/datum/gear_tweak/color/gear_tweak_free_color_choice = new()
/datum/gear_tweak/color
var/list/valid_colors
/datum/gear_tweak/color/New(var/list/valid_colors)
src.valid_colors = valid_colors
..()
/datum/gear_tweak/color/get_contents(var/metadata)
return "Color: <font color='[metadata]'>&#9899;</font>"
/datum/gear_tweak/color/get_default()
return valid_colors ? valid_colors[1] : COLOR_GRAY
/datum/gear_tweak/color/get_metadata(var/user, var/metadata)
if(valid_colors)
return input(user, "Choose an item color.", "Character Preference", metadata) as null|anything in valid_colors
return input(user, "Choose an item color.", "Global Preference", metadata) as color|null
/datum/gear_tweak/color/tweak_item(var/obj/item/I, var/metadata)
if(valid_colors && !(metadata in valid_colors))
return
I.color = metadata
/*
Path adjustment
* Path adjustment
*/
/datum/gear_tweak/path
@@ -54,7 +25,7 @@ Path adjustment
..()
/datum/gear_tweak/path/get_contents(var/metadata)
return "Type: [metadata]"
return "(Type: [metadata])"
/datum/gear_tweak/path/get_default()
return valid_paths[1]
@@ -68,28 +39,27 @@ Path adjustment
gear_data.path = valid_paths[metadata]
/*
Content adjustment
* Content adjustment
*/
/datum/gear_tweak/contents
var/list/valid_contents
/datum/gear_tweak/contents/New()
valid_contents = args.Copy()
valid_contents = args
..()
/datum/gear_tweak/contents/get_contents(var/metadata)
return "Contents: [english_list(metadata, and_text = ", ")]"
return "(Contents)"
/datum/gear_tweak/contents/get_default()
. = list()
for(var/i = 1 to valid_contents.len)
. += "Random"
var/list/contents = valid_contents[i]
. += contents[1]
/datum/gear_tweak/contents/get_metadata(var/user, var/list/metadata)
. = list()
for(var/i = metadata.len to (valid_contents.len - 1))
metadata += "Random"
for(var/i = 1 to valid_contents.len)
var/entry = input(user, "Choose an entry.", "Character Preference", metadata[i]) as null|anything in (valid_contents[i] + list("Random", "None"))
if(entry)
@@ -101,17 +71,16 @@ Content adjustment
if(metadata.len != valid_contents.len)
return
for(var/i = 1 to valid_contents.len)
var/path
var/list/contents = valid_contents[i]
if(metadata[i] == "Random")
path = pick(contents)
path = contents[path]
else if(metadata[i] == "None")
continue
else
path = contents[metadata[i]]
new path(I)
var/path = contents[metadata[i]]
if(path)
if(path == "Random")
path = pick(contents)
path = contents[path]
else if(path == "None")
continue
new path(I)
/*
Reagents adjustment
*/
@@ -142,4 +111,4 @@ Reagents adjustment
. = valid_reagents[pick(valid_reagents)]
else
. = valid_reagents[metadata]
I.reagents.add_reagent(., I.reagents.get_free_space())
I.reagents.add_reagent(., I.reagents.get_free_space())
code/modules/clothing/chameleon.dm
+2 -2
View File
@@ -297,7 +297,7 @@
//*********************
/obj/item/clothing/glasses/chameleon
name = "Optical Meson Scanner"
name = "optical meson scanner"
icon_state = "meson"
item_state = "glasses"
desc = "It looks like a plain set of mesons, but on closer inspection, it seems to have a small dial inside."
@@ -310,7 +310,7 @@
clothing_choices = generate_chameleon_choices(/obj/item/clothing/glasses, list(src.type))
/obj/item/clothing/glasses/chameleon/emp_act(severity) //Because we don't have psych for all slots right now but still want a downside to EMP. In this case your cover's blown.
name = "Optical Meson Scanner"
name = "optical meson scanner"
desc = "It's a set of mesons."
icon_state = "meson"
update_icon()
code/modules/clothing/glasses/glasses.dm
+14 -14
View File
@@ -35,7 +35,7 @@
user.update_action_buttons()
/obj/item/clothing/glasses/meson
name = "Optical Meson Scanner"
name = "optical meson scanner"
desc = "Used for seeing walls, floors, and stuff through anything."
icon_state = "meson"
item_state = "glasses"
@@ -55,7 +55,7 @@
prescription = 1
/obj/item/clothing/glasses/science
name = "Science Goggles"
name = "science goggles"
desc = "Used to protect your eyes against harmful chemicals!"
icon_state = "purple"
item_state = "glasses"
@@ -67,7 +67,7 @@
overlay = global_hud.science
/obj/item/clothing/glasses/night
name = "Night Vision Goggles"
name = "night vision goggles"
desc = "You can totally see in the dark now!"
icon_state = "night"
item_state = "glasses"
@@ -96,7 +96,7 @@
body_parts_covered = 0
/obj/item/clothing/glasses/material
name = "Optical Material Scanner"
name = "optical material scanner"
desc = "Very confusing glasses."
icon_state = "material"
item_state = "glasses"
@@ -105,7 +105,7 @@
vision_flags = SEE_OBJS
/obj/item/clothing/glasses/regular
name = "Prescription Glasses"
name = "prescription glasses"
desc = "Made by Nerd. Co."
icon_state = "glasses"
item_state = "glasses"
@@ -131,12 +131,12 @@
qdel(src)
/obj/item/clothing/glasses/regular/scanners
name = "Scanning Goggles"
name = "scanning goggles"
desc = "A very oddly shaped pair of goggles with bits of wire poking out the sides. A soft humming sound emanates from it."
icon_state = "uzenwa_sissra_1"
/obj/item/clothing/glasses/regular/hipster
name = "Prescription Glasses"
name = "prescription glasses"
desc = "Made by Uncool. Co."
icon_state = "hipster_glasses"
item_state = "hipster_glasses"
@@ -149,7 +149,7 @@
body_parts_covered = 0
/obj/item/clothing/glasses/gglasses
name = "Green Glasses"
name = "green glasses"
desc = "Forest green glasses, like the kind you'd wear when hatching a nasty scheme."
icon_state = "gglasses"
item_state = "gglasses"
@@ -218,7 +218,7 @@
/obj/item/clothing/glasses/sunglasses/blinders
name = "Vaurcae Blinders"
name = "vaurcae blinders"
desc = "Specially designed Vaurca blindfold, designed to let in just enough light to see."
icon_state = "blinders"
item_state = "blinders"
@@ -257,7 +257,7 @@
icon_state = "swatgoggles"
/obj/item/clothing/glasses/thermal
name = "Optical Thermal Scanner"
name = "optical thermal scanner"
desc = "Thermals in the shape of glasses."
icon_state = "thermal"
item_state = "glasses"
@@ -287,7 +287,7 @@
overlay = global_hud.thermal
/obj/item/clothing/glasses/thermal/syndi //These are now a traitor item, concealed as mesons. -Pete
name = "Optical Meson Scanner"
name = "optical meson scanner"
desc = "Used for seeing walls, floors, and stuff through anything."
icon_state = "meson"
origin_tech = list(TECH_MAGNET = 3, TECH_ILLEGAL = 4)
@@ -298,7 +298,7 @@
action_button_name = null
/obj/item/clothing/glasses/thermal/plain/monocle
name = "Thermoncle"
name = "thermoncle"
desc = "A monocle thermal."
icon_state = "thermoncle"
flags = null //doesn't protect eyes because it's a monocle, duh
@@ -306,14 +306,14 @@
body_parts_covered = 0
/obj/item/clothing/glasses/thermal/plain/eyepatch
name = "Optical Thermal Eyepatch"
name = "optical thermal eyepatch"
desc = "An eyepatch with built-in thermal optics"
icon_state = "eyepatch"
item_state = "eyepatch"
body_parts_covered = 0
/obj/item/clothing/glasses/thermal/plain/jensen
name = "Optical Thermal Implants"
name = "optical thermal implants"
desc = "A set of implantable lenses designed to augment your vision"
icon_state = "thermalimplants"
item_state = "syringe_kit"
code/modules/clothing/glasses/hud.dm
+3 -3
View File
@@ -13,7 +13,7 @@
return
/obj/item/clothing/glasses/hud/health
name = "Health Scanner HUD"
name = "health scanner HUD"
desc = "A heads-up display that scans the humans in view and provides accurate data about their health status."
icon_state = "healthhud"
body_parts_covered = 0
@@ -38,7 +38,7 @@
del(src)
/obj/item/clothing/glasses/hud/security
name = "Security HUD"
name = "security HUD"
desc = "A heads-up display that scans the humans in view and provides accurate data about their ID status and security records."
icon_state = "securityhud"
body_parts_covered = 0
@@ -60,7 +60,7 @@
del(src)
/obj/item/clothing/glasses/hud/security/jensenshades
name = "Augmented shades"
name = "augmented shades"
desc = "Polarized bioneural eyewear, designed to augment your vision."
icon_state = "jensenshades"
item_state = "jensenshades"
code/modules/clothing/gloves/boxing.dm
-6
View File
@@ -21,9 +21,3 @@
/obj/item/clothing/gloves/boxing/yellow
icon_state = "boxingyellow"
item_state = "boxingyellow"
/obj/item/clothing/gloves/white
name = "white gloves"
desc = "These look pretty fancy."
icon_state = "latex"
item_state = "lgloves"
code/modules/clothing/gloves/color.dm
+8 -2
View File
@@ -84,10 +84,16 @@
desc = "A pair of gloves, they don't look special in any way."
icon_state = "brown"
item_state = "browngloves"
/obj/item/clothing/gloves/white
name = "white gloves"
desc = "These look pretty fancy."
icon_state = "latex"
item_state = "lgloves"
/obj/item/clothing/gloves/yellow/specialt
desc = "These gloves will protect the wearer from electric shock. Made special for Tajaran use."
name = "Tajaran electrical gloves"
name = "tajaran electrical gloves"
icon_state = "yellow"
item_state = "ygloves"
siemens_coefficient = 0
@@ -96,7 +102,7 @@
/obj/item/clothing/gloves/yellow/specialu
desc = "These gloves will protect the wearer from electric shock. Made special for Unathi use."
name = "Unathi electrical gloves"
name = "unathi electrical gloves"
icon_state = "yellow"
item_state = "ygloves"
siemens_coefficient = 0
code/modules/clothing/gloves/miscellaneous.dm
+3 -2
View File
@@ -13,7 +13,7 @@
/obj/item/clothing/gloves/swat
desc = "These tactical gloves are somewhat fire and impact-resistant."
name = "\improper SWAT Gloves"
name = "\improper SWAT gloves"
icon_state = "black"
item_state = "swat_gl"
siemens_coefficient = 0.50
@@ -59,7 +59,7 @@
species_restricted = list("Unathi")
/obj/item/clothing/gloves/latex/tajara
name = "tajara latex gloves"
name = "tajaran latex gloves"
desc = "Sterile latex gloves. Designed for Tajara use."
species_restricted = list("Tajara")
@@ -72,6 +72,7 @@
wired = 1
species_restricted = null
gender = NEUTER
body_parts_covered = null
verb/checktime()
set category = "Object"
code/modules/clothing/masks/gasmask.dm
-9
View File
@@ -86,12 +86,6 @@
icon_state = "sexymime"
item_state = "sexymime"
/obj/item/clothing/mask/gas/death_commando
name = "Death Commando Mask"
icon_state = "death_commando_mask"
item_state = "death_commando_mask"
siemens_coefficient = 0.2
/obj/item/clothing/mask/gas/cyborg
name = "cyborg visor"
desc = "Beep boop"
@@ -108,8 +102,5 @@
desc = "A compact carbon-fiber respirator covering the mouth and nose to protect against the inhalation of smoke and other harmful gasses. "
icon_state = "fullgas"
item_state = "fullgas"
item_flags = BLOCK_GAS_SMOKE_EFFECT | AIRTIGHT
flags_inv = HIDEFACE
body_parts_covered = FACE
w_class = 2.0
armor = list(melee = 25, bullet = 10, laser = 25, energy = 25, bomb = 0, bio = 50, rad = 15)
code/modules/clothing/spacesuits/alien.dm
+2 -2
View File
@@ -1,6 +1,6 @@
//Skrell space gear. Sleek like a wetsuit.
/obj/item/clothing/head/helmet/space/skrell
name = "Skrellian helmet"
name = "skrellian helmet"
desc = "Smoothly contoured and polished to a shine. Still looks like a fishbowl."
armor = list(melee = 20, bullet = 20, laser = 50,energy = 50, bomb = 50, bio = 100, rad = 100)
max_heat_protection_temperature = SPACE_SUIT_MAX_HEAT_PROTECTION_TEMPERATURE
@@ -14,7 +14,7 @@
icon_state = "skrell_helmet_black"
/obj/item/clothing/suit/space/skrell
name = "Skrellian voidsuit"
name = "skrellian voidsuit"
desc = "Seems like a wetsuit with reinforced plating seamlessly attached to it. Very chic."
armor = list(melee = 20, bullet = 20, laser = 50,energy = 50, bomb = 50, bio = 100, rad = 100)
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/weapon/rcd)
code/modules/clothing/spacesuits/miscellaneous.dm
+2 -2
View File
@@ -68,14 +68,14 @@
//Orange emergency space suit
/obj/item/clothing/head/helmet/space/emergency
name = "Emergency Space Helmet"
name = "emergency space helmet"
icon_state = "emergencyhelm"
item_state = "emergencyhelm"
desc = "A simple helmet with a built in light, smells like mothballs."
flash_protection = FLASH_PROTECTION_NONE
/obj/item/clothing/suit/space/emergency
name = "Emergency Softsuit"
name = "emergency softsuit"
icon_state = "syndicate-orange"
item_state = "syndicate-orange"
desc = "A thin, ungainly softsuit colored in blaze orange for rescuers to easily locate, looks pretty fragile."
code/modules/clothing/spacesuits/rig/suits/ert.dm
+1 -1
View File
@@ -74,7 +74,7 @@
)
/obj/item/weapon/rig/ert/assetprotection
name = "Heavy Asset Protection suit control module"
name = "heavy asset protection suit control module"
desc = "A heavy suit worn by the highest level of Asset Protection, don't mess with the person wearing this. Armoured and space ready."
suit_type = "heavy asset protection"
icon_state = "asset_protection_rig"
code/modules/clothing/suits/alien.dm
+2 -2
View File
@@ -8,7 +8,7 @@
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS
/obj/item/clothing/suit/unathi/robe/robe_coat //I was at a loss for names under-the-hood.
name = "tzirzi"
name = "tzirzi robes"
desc = "A casual Moghes-native garment typically worn by Unathi while planet-side."
icon = 'icons/obj/clothing/robe_coat.dmi'
icon_state = "robe_coat"
@@ -36,4 +36,4 @@
name = "headscarf"
desc = "A scarf of coarse fabric. Seems to have ear-holes."
icon_state = "zhan_scarf"
body_parts_covered = HEAD|FACE
body_parts_covered = HEAD|FACE
code/modules/clothing/suits/miscellaneous.dm
+1 -87
View File
@@ -178,7 +178,7 @@
*/
/obj/item/clothing/suit/straight_jacket
name = "straight jacket"
name = "straitjacket"
desc = "A suit that completely restrains the wearer."
icon_state = "straight_jacket"
item_state = "straight_jacket"
@@ -201,23 +201,6 @@
item_state = "ianshirt"
body_parts_covered = UPPER_TORSO|ARMS
//pyjamas
//originally intended to be pinstripes >.>
/obj/item/clothing/under/bluepyjamas
name = "blue pyjamas"
desc = "Slightly old-fashioned sleepwear."
icon_state = "blue_pyjamas"
item_state = "blue_pyjamas"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS
/obj/item/clothing/under/redpyjamas
name = "red pyjamas"
desc = "Slightly old-fashioned sleepwear."
icon_state = "red_pyjamas"
item_state = "red_pyjamas"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS
//coats
/obj/item/clothing/suit/leathercoat
@@ -238,41 +221,6 @@
icon_state = "neocoat"
item_state = "neocoat"
//stripper
/obj/item/clothing/under/stripper
body_parts_covered = 0
/obj/item/clothing/under/stripper/stripper_pink
name = "pink swimsuit"
desc = "A rather skimpy pink swimsuit."
icon_state = "stripper_p_under"
siemens_coefficient = 1
/obj/item/clothing/under/stripper/stripper_green
name = "green swimsuit"
desc = "A rather skimpy green swimsuit."
icon_state = "stripper_g_under"
siemens_coefficient = 1
/obj/item/clothing/suit/stripper/stripper_pink
name = "pink skimpy dress"
desc = "A rather skimpy pink dress."
icon_state = "stripper_p_over"
siemens_coefficient = 1
/obj/item/clothing/suit/stripper/stripper_green
name = "green skimpy dress"
desc = "A rather skimpy green dress."
icon_state = "stripper_g_over"
item_state = "stripper_g"
siemens_coefficient = 1
/obj/item/clothing/under/stripper/mankini
name = "mankini"
desc = "No honest man would wear this abomination"
icon_state = "mankini"
siemens_coefficient = 1
/obj/item/clothing/suit/xenos
name = "xenos suit"
desc = "A suit made out of chitinous alien hide."
@@ -281,40 +229,6 @@
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
siemens_coefficient = 2.0
//swimsuit
/obj/item/clothing/under/swimsuit/
siemens_coefficient = 1
body_parts_covered = 0
/obj/item/clothing/under/swimsuit/black
name = "black swimsuit"
desc = "An oldfashioned black swimsuit."
icon_state = "swim_black"
siemens_coefficient = 1
/obj/item/clothing/under/swimsuit/blue
name = "blue swimsuit"
desc = "An oldfashioned blue swimsuit."
icon_state = "swim_blue"
siemens_coefficient = 1
/obj/item/clothing/under/swimsuit/purple
name = "purple swimsuit"
desc = "An oldfashioned purple swimsuit."
icon_state = "swim_purp"
siemens_coefficient = 1
/obj/item/clothing/under/swimsuit/green
name = "green swimsuit"
desc = "An oldfashioned green swimsuit."
icon_state = "swim_green"
siemens_coefficient = 1
/obj/item/clothing/under/swimsuit/red
name = "red swimsuit"
desc = "An oldfashioned red swimsuit."
icon_state = "swim_red"
siemens_coefficient = 1
/obj/item/clothing/suit/poncho
name = "poncho"
code/modules/clothing/under/accessories/armband.dm
+1 -1
View File
@@ -42,5 +42,5 @@
/obj/item/clothing/accessory/armband/atlas
name = "atlas armband"
desc = "This is a armband showing anyone who sees this person, as a member of the Political party Atlas. This one is black."
desc = "This is a armband showing anyone who sees this person, as a member of the political party Atlas. This one is black."
icon_state = "black"
code/modules/clothing/under/jobs/civilian.dm
+7 -7
View File
@@ -83,7 +83,7 @@
/obj/item/clothing/under/rank/internalaffairs
desc = "The plain, professional attire of an Internal Affairs Agent. The collar is <i>immaculately</i> starched."
name = "Internal Affairs uniform"
name = "internal affairs uniform"
icon_state = "internalaffairs"
item_state = "ba_suit"
worn_state = "internalaffairs"
@@ -100,18 +100,18 @@
/obj/item/clothing/under/lawyer
desc = "Slick threads."
name = "Lawyer suit"
name = "lawyer suit"
/obj/item/clothing/under/lawyer/black
name = "black Lawyer suit"
name = "black lawyer suit"
icon_state = "lawyer_black"
item_state = "lawyer_black"
worn_state = "lawyer_black"
/obj/item/clothing/under/lawyer/female
name = "black Lawyer suit"
name = "black lawyer suit"
icon_state = "black_suit_fem"
item_state = "lawyer_black"
worn_state = "black_suit_fem"
@@ -132,7 +132,7 @@
/obj/item/clothing/under/lawyer/bluesuit
name = "Blue Suit"
name = "blue suit"
desc = "A classy suit and tie"
icon_state = "bluesuit"
item_state = "ba_suit"
@@ -140,13 +140,13 @@
/obj/item/clothing/under/lawyer/purpsuit
name = "Purple Suit"
name = "purple suit"
icon_state = "lawyer_purp"
item_state = "ba_suit"
worn_state = "lawyer_purp"
/obj/item/clothing/under/lawyer/oldman
name = "Old Man's Suit"
name = "old man's suit"
desc = "A classic suit for the older gentleman with built in back support."
icon_state = "oldman"
item_state = "johnny"
code/modules/clothing/under/jobs/security.dm
-6
View File
@@ -17,12 +17,6 @@
armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
siemens_coefficient = 0.7
/obj/item/clothing/head/warden
name = "warden's hat"
desc = "It's a special helmet issued to the Warden of a securiy force."
icon_state = "policehelm"
body_parts_covered = 0
/obj/item/clothing/under/rank/security
name = "security officer's jumpsuit"
desc = "It's made of a slightly sturdier material than standard jumpsuits, to allow for robust protection."
code/modules/clothing/under/miscellaneous.dm
+75 -7
View File
@@ -1,6 +1,6 @@
/obj/item/clothing/under/pj/red
name = "red pj's"
desc = "Sleepwear."
name = "red pyjamas"
desc = "Slightly old-fashioned sleepwear."
icon_state = "red_pyjamas"
worn_state = "red_pyjamas"
item_state = "w_suit"
@@ -17,8 +17,8 @@
)
/obj/item/clothing/under/pj/blue
name = "blue pj's"
desc = "Sleepwear."
name = "blue pyjamas"
desc = "Slightly old-fashioned sleepwear."
icon_state = "blue_pyjamas"
worn_state = "blue_pyjamas"
item_state = "w_suit"
@@ -76,7 +76,7 @@
//This set of uniforms looks fairly fancy and is generally used for high-ranking NT personnel from what I've seen, so lets give them appropriate ranks.
/obj/item/clothing/under/rank/centcom
desc = "Gold trim on space-black cloth, this uniform displays the rank of \"Captain.\""
name = "\improper Officer's Dress Uniform"
name = "\improper officer's dress uniform"
icon_state = "officer"
item_state = "lawyer_black"
worn_state = "officer"
@@ -84,7 +84,6 @@
/obj/item/clothing/under/rank/centcom_officer
desc = "Gold trim on space-black cloth, this uniform displays the rank of \"Admiral.\""
name = "\improper Officer's Dress Uniform"
icon_state = "officer"
item_state = "lawyer_black"
worn_state = "officer"
@@ -92,7 +91,6 @@
/obj/item/clothing/under/rank/centcom_captain
desc = "Gold trim on space-black cloth, this uniform displays the rank of \"Admiral-Executive.\""
name = "\improper Officer's Dress Uniform"
icon_state = "centcom"
item_state = "lawyer_black"
worn_state = "centcom"
@@ -543,3 +541,73 @@
icon_state = "blue_blazer"
item_state = "blue_blazer"
worn_state = "blue_blazer"
//stripper
/obj/item/clothing/under/stripper
body_parts_covered = 0
/obj/item/clothing/under/stripper/stripper_pink
name = "pink swimsuit"
desc = "A rather skimpy pink swimsuit."
icon_state = "stripper_p_under"
siemens_coefficient = 1
/obj/item/clothing/under/stripper/stripper_green
name = "green swimsuit"
desc = "A rather skimpy green swimsuit."
icon_state = "stripper_g_under"
siemens_coefficient = 1
/obj/item/clothing/suit/stripper/stripper_pink
name = "pink skimpy dress"
desc = "A rather skimpy pink dress."
icon_state = "stripper_p_over"
siemens_coefficient = 1
/obj/item/clothing/suit/stripper/stripper_green
name = "green skimpy dress"
desc = "A rather skimpy green dress."
icon_state = "stripper_g_over"
item_state = "stripper_g"
siemens_coefficient = 1
/obj/item/clothing/under/stripper/mankini
name = "mankini"
desc = "No honest man would wear this abomination"
icon_state = "mankini"
siemens_coefficient = 1
//swimsuit
/obj/item/clothing/under/swimsuit/
siemens_coefficient = 1
body_parts_covered = 0
/obj/item/clothing/under/swimsuit/black
name = "black swimsuit"
desc = "An oldfashioned black swimsuit."
icon_state = "swim_black"
siemens_coefficient = 1
/obj/item/clothing/under/swimsuit/blue
name = "blue swimsuit"
desc = "An oldfashioned blue swimsuit."
icon_state = "swim_blue"
siemens_coefficient = 1
/obj/item/clothing/under/swimsuit/purple
name = "purple swimsuit"
desc = "An oldfashioned purple swimsuit."
icon_state = "swim_purp"
siemens_coefficient = 1
/obj/item/clothing/under/swimsuit/green
name = "green swimsuit"
desc = "An oldfashioned green swimsuit."
icon_state = "swim_green"
siemens_coefficient = 1
/obj/item/clothing/under/swimsuit/red
name = "red swimsuit"
desc = "An oldfashioned red swimsuit."
icon_state = "swim_red"
siemens_coefficient = 1
code/modules/clothing/under/syndicate.dm
+1 -1
View File
@@ -12,7 +12,7 @@
name = "combat turtleneck"
/obj/item/clothing/under/syndicate/tacticool
name = "\improper Tacticool turtleneck"
name = "tacticool turtleneck"
desc = "Just looking at it makes you want to buy an SKS, go into the woods, and -operate-."
icon_state = "tactifool"
item_state = "bl_suit"
code/modules/mob/living/carbon/human/species/outsider/shadow.dm
+1
View File
@@ -12,6 +12,7 @@
has_organ = list()
siemens_coefficient = 0
rarity_value = 10
virus_immune = 1
blood_color = "#CCCCCC"
flesh_color = "#AAAAAA"
code/modules/mob/living/carbon/human/species/outsider/skeleton.dm
+2
View File
@@ -17,6 +17,8 @@
siemens_coefficient = 0
ethanol_resistance = -1 //no drunk skeletons
virus_immune = 1
rarity_value = 10
blurb = "Skeletons are undead brought back to life through dark wizardry, \
they are empty shells fueled by sheer obscure power and blood-magic. \
code/modules/mob/living/carbon/human/species/outsider/vox.dm
+1
View File
@@ -34,6 +34,7 @@
eyes = "vox_eyes_s"
gluttonous = GLUT_SMALLER
virus_immune = 1
breath_type = "nitrogen"
poison_type = "oxygen"
code/modules/mob/living/carbon/human/species/station/golem.dm
+2 -1
View File
@@ -14,7 +14,8 @@
brute_mod = 0.5
slowdown = 1
virus_immune = 1
warning_low_pressure = 50 //golems can into space now
hazard_low_pressure = 0
code/modules/mob/living/carbon/human/species/station/slime.dm
+1
View File
@@ -13,6 +13,7 @@
siemens_coefficient = 3 //conductive
darksight = 3
rarity_value = 5
virus_immune = 1
blood_color = "#05FF9B"
flesh_color = "#05FFFB"
code/modules/mob/living/carbon/human/species/xenomorphs/alien_species.dm
+2
View File
@@ -19,6 +19,8 @@
sprint_speed_factor = 2
sprint_cost_factor = 0.80
stamina_recovery = 5
virus_immune = 1
brute_mod = 0.25 // Hardened carapace.
burn_mod = 2 // Weak to fire.
code/modules/projectiles/projectile.dm
+1 -1
View File
@@ -186,7 +186,7 @@
def_zone = hit_zone //set def_zone, so if the projectile ends up hitting someone else later (to be implemented), it is more likely to hit the same part
result = target_mob.bullet_act(src, def_zone)
if(result == PROJECTILE_FORCE_MISS)
if(result == PROJECTILE_FORCE_MISS && (can_miss == 0)) //if you're shooting at point blank you can't miss.
if(!silenced)
target_mob.visible_message("<span class='notice'>\The [src] misses [target_mob] narrowly!</span>")
return 0