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

Wizard blade, loadout and general dev tweaks (#1905)

Browse Source 
-add reflection and parry to the wizard rune sword
-tweaks and add more things to the custom loadout
-remove the linebin and thermals from cargo
-add exosuit paint kits and some other things to cargo spawn
-re-add the non slip flag to skrells
- Fixes #1890
-adds more hats
-beastmen botanists now get some snowflake gloves
-unathi are now poisoned by alcohol, at jackboot's request
-fix smacking people against toilets having no delay
-fix some visible message issues and wrong date in the sink and shower
-removed being able to select bst gear using chameleon clothing
-fix some grammer
-fix vaurca voidsuits having an outdated species
This commit is contained in:
Alberyk
2017-03-19 00:05:25 +02:00
committed by skull132
parent 63eafb3643
commit ae5956fd6e
32 changed files with 221 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/verbs/bluespacetech.dm
+5 -5
View File
@@ -349,7 +349,7 @@
//Headset
/obj/item/device/radio/headset/ert/bst
name = "\improper Bluespace Technician's headset"
name = "bluespace technician's headset"
desc = "A Bluespace Technician's headset. The letters 'BST' are stamped on the side."
translate_binary = 1
translate_hive = 1
@@ -375,7 +375,7 @@
//Clothes
/obj/item/clothing/under/rank/centcom_officer/bst
name = "\improper Bluespace Technician's Uniform"
name = "bluespace technician's uniform"
desc = "A Bluespace Technician's Uniform. There is a logo on the sleeve that reads 'BST'."
has_sensor = 0
sensor_mode = 0
@@ -395,7 +395,7 @@
//Gloves
/obj/item/clothing/gloves/swat/bst
name = "\improper Bluespace Technician's gloves"
name = "bluespace technician's gloves"
desc = "A pair of modified gloves. The letters 'BST' are stamped on the side."
siemens_coefficient = 0
permeability_coefficient = 0
@@ -412,7 +412,7 @@
//Sunglasses
/obj/item/clothing/glasses/sunglasses/bst
name = "\improper Bluespace Technician's Glasses"
name = "bluespace technician's glasses"
desc = "A pair of modified sunglasses. The word 'BST' is stamped on the side."
// var/list/obj/item/clothing/glasses/hud/health/hud = null
vision_flags = (SEE_TURFS|SEE_OBJS|SEE_MOBS)
@@ -435,7 +435,7 @@
//Shoes
/obj/item/clothing/shoes/black/bst
name = "\improper Bluespace Technician's shoes"
name = "bluespace technician's shoes"
desc = "A pair of black shoes with extra grip. The letters 'BST' are stamped on the side."
icon_state = "black"
flags = NOSLIP
code/modules/cargo/randomstock.dm
+48 -22
View File
@@ -134,6 +134,7 @@ var/list/global/random_stock_common = list(
"paicard" = 2,
"phoronsheets" = 2,
"hide" = 1,
"paint" = 0.5,
"nothing" = 0)
var/list/global/random_stock_uncommon = list(
@@ -177,7 +178,6 @@ var/list/global/random_stock_uncommon = list(
"crimekit" = 1,
"carpet" = 2,
"gift" = 4,
"linenbin" = 1,
"coatrack" = 1,
"riotshield" = 2,
"fireaxe" = 1,
@@ -203,6 +203,7 @@ var/list/global/random_stock_uncommon = list(
"lizardhide" = 0.5,
"wintercoat" = 0.5,
"cookingoil" = 1,
"coin" = 1.3,
"nothing" = 0)
var/list/global/random_stock_rare = list(
@@ -214,7 +215,6 @@ var/list/global/random_stock_rare = list(
"combatmeds" = 3,
"batterer" = 0.75,
"posibrain" = 3,
"thermals" = 0.75,
"bsbeaker" = 3,
"energyshield" = 2,
"hardsuit" = 0.75,
@@ -227,6 +227,7 @@ var/list/global/random_stock_rare = list(
"voice" = 1.5,
"xenohide" = 0.5,
"humanhide" = 0.5,
"modkit" = 1,
"nothing" = 0)
var/list/global/random_stock_large = list(
@@ -236,7 +237,7 @@ var/list/global/random_stock_large = list(
"tacticool" = 0.2,
"radsuit" = 3,
"exosuit" = 1.2,//A randomly generated exosuit in a very variable condition.
"EOD" = 1.5,
"EOD" = 1.5,
"biosuit" = 3,
"hydrotray" = 3,
"oxycanister" = 6,//Cargo should almost always have an oxycanister
@@ -261,6 +262,7 @@ var/list/global/random_stock_large = list(
"jukebox" = 1.2,
"pipemachine" = 1.7,
"bike" = 0.3,
"sol" = 0.2,
"nothing" = 0)
@@ -987,13 +989,18 @@ var/list/global/random_stock_large = list(
if ("hide")
new /obj/item/stack/material/animalhide(L, rand(5,50))
if ("paint")
var/list/paints = list(
/obj/item/weapon/reagent_containers/glass/paint/red,
/obj/item/weapon/reagent_containers/glass/paint/yellow,
/obj/item/weapon/reagent_containers/glass/paint/green,
/obj/item/weapon/reagent_containers/glass/paint/blue,
/obj/item/weapon/reagent_containers/glass/paint/purple,
/obj/item/weapon/reagent_containers/glass/paint/black,
/obj/item/weapon/reagent_containers/glass/paint/white
)
var/type = pick(paints)
new type(L)
@@ -1067,7 +1074,8 @@ var/list/global/random_stock_large = list(
if ("flare")
new /obj/item/device/flashlight/flare(L)
new /obj/item/device/flashlight/flare(L)
new /obj/item/device/flashlight/flare(L)
if (prob(50))
new /obj/random/glowstick(L)
if("deathalarm")
new /obj/item/weapon/storage/box/cdeathalarm_kit(L)
if("trackimp")
@@ -1232,8 +1240,6 @@ var/list/global/random_stock_large = list(
new /obj/item/stack/tile/carpet(L, 50)
if ("gift")
new /obj/item/weapon/a_gift(L)
if ("linenbin")
new /obj/structure/bedsheetbin(get_turf(L))
if ("coatrack")
var/turf/T = get_turf(L)
if (!turf_clear(T))
@@ -1432,7 +1438,8 @@ var/list/global/random_stock_large = list(
break
new /obj/structure/reagent_dispensers/cookingoil(T)
if("coin")
new /obj/random/coin(L)
@@ -1502,8 +1509,6 @@ var/list/global/random_stock_large = list(
new /obj/item/device/batterer(L)
if("posibrain")
new /obj/item/device/mmi/digital/posibrain(L)
if("thermals")
new /obj/item/clothing/glasses/thermal(L)
if("bsbeaker")
new /obj/item/weapon/reagent_containers/glass/beaker/bluespace(L)
if (prob(50))
@@ -1521,7 +1526,8 @@ var/list/global/random_stock_large = list(
/obj/item/weapon/material/sword/rapier,
/obj/item/weapon/material/sword/longsword,
/obj/item/weapon/material/sword/trench,
/obj/item/weapon/material/sword/sabre
/obj/item/weapon/material/sword/sabre,
/obj/item/weapon/material/sword/axe
)
var/type = pick(swords)
@@ -1542,8 +1548,8 @@ var/list/global/random_stock_large = list(
/obj/item/weapon/rig/ert/assetprotection = 0.05,
/obj/item/weapon/rig/light = 0.5,
/obj/item/weapon/rig/light/hacker = 0.8,
/obj/item/weapon/rig/light/stealth = 1.5,
/obj/item/weapon/rig/merc = 0.5,
/obj/item/weapon/rig/light/stealth = 0.5,
/obj/item/weapon/rig/merc/empty = 0.5,
/obj/item/weapon/rig/industrial = 3,
/obj/item/weapon/rig/eva = 3,
/obj/item/weapon/rig/ce = 2,
@@ -1606,10 +1612,24 @@ var/list/global/random_stock_large = list(
if("humanhide")
new /obj/item/stack/material/animalhide/human(L, rand(2,15))
if("modkit")
var/list/modkits = list(
/obj/item/device/kit/paint/ripley,
/obj/item/device/kit/paint/ripley/death,
/obj/item/device/kit/paint/ripley/flames_red,
/obj/item/device/kit/paint/ripley/flames_blue,
/obj/item/device/kit/paint/ripley/titan,
/obj/item/device/kit/paint/ripley/earth,
/obj/item/device/kit/paint/durand,
/obj/item/device/kit/paint/durand/seraph,
/obj/item/device/kit/paint/durand/phazon,
/obj/item/device/kit/paint/gygax,
/obj/item/device/kit/paint/gygax/darkgygax,
/obj/item/device/kit/paint/gygax/recitence
)
var/type = pick(modkits)
new type(L)
@@ -1799,6 +1819,12 @@ var/list/global/random_stock_large = list(
if ("bike")
new /obj/vehicle/bike(L)
if ("sol")
if (prob(50))
new /obj/structure/closet/sol/navy(L)
else
new /obj/structure/closet/sol/marine(L)
//This will be complex
//Spawns a random exosuit, Probably not in good condition
code/modules/client/preference_setup/loadout/loadout_accessories.dm
+2 -2
View File
@@ -28,7 +28,7 @@
/datum/gear/accessory/holster
display_name = "holster selection"
path = /obj/item/clothing/accessory/holster
path = /obj/item/clothing/accessory/holster/armpit
allowed_roles = list("Captain", "Head of Personnel", "Security Officer", "Warden", "Head of Security","Detective", "Security Cadet")
/datum/gear/accessory/holster/New()
@@ -42,7 +42,7 @@
/datum/gear/accessory/tie
display_name = "tie selection"
path = /obj/item/clothing/accessory
path = /obj/item/clothing/accessory/blue
/datum/gear/accessory/tie/New()
..()
code/modules/client/preference_setup/loadout/loadout_eyes.dm
+5
View File
@@ -28,6 +28,11 @@
/datum/gear/eyes/sciencegoggles
display_name = "science Goggles"
path = /obj/item/clothing/glasses/science
/datum/gear/eyes/mesonprescription
display_name = "meson goggles, prescription"
path = /obj/item/clothing/glasses/meson/prescription
allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Engineering Apprentice", "Research Director","Scientist")
/datum/gear/eyes/security
display_name = "security HUD"
code/modules/client/preference_setup/loadout/loadout_gloves.dm
+1 -1
View File
@@ -1,7 +1,7 @@
/datum/gear/gloves
display_name = "watch"
path = /obj/item/clothing/gloves/watch
cost = 2
cost = 1
slot = slot_gloves
sort_category = "Gloves and Handwear"
code/modules/client/preference_setup/loadout/loadout_head.dm
+35 -18
View File
@@ -1,6 +1,6 @@
/datum/gear/head
display_name = "hat, boatsman"
path = /obj/item/clothing/head/boaterhat
display_name = "ushanka"
path = /obj/item/clothing/head/ushanka
slot = slot_head
sort_category = "Hats and Headwear"
@@ -64,12 +64,12 @@
path = /obj/item/clothing/head/beret/sec/hos
allowed_roles = list("Head of Security")
/datum/gear/head/cap/corp
/datum/gear/head/corp
display_name = "cap, corporate (security)"
path = /obj/item/clothing/head/soft/sec/corp
allowed_roles = list("Security Officer","Head of Security","Warden","Security Cadet","Detective")
/datum/gear/head/cap/sec
/datum/gear/head/sec
display_name = "cap, security"
path = /obj/item/clothing/head/soft/sec
allowed_roles = list("Security Officer","Head of Security","Warden","Security Cadet","Detective")
@@ -92,26 +92,29 @@
display_name = "hair flower pin, red"
path = /obj/item/clothing/head/hairflower
/datum/gear/head/bowler
display_name = "hat, bowler"
path = /obj/item/clothing/head/bowler
/datum/gear/head/hats
display_name = "hat selection"
path = /obj/item/clothing/head/boaterhat
/datum/gear/head/fez
display_name = "hat, fez"
path = /obj/item/clothing/head/fez
/datum/gear/head/tophat
display_name = "hat, tophat"
path = /obj/item/clothing/head/that
/datum/gear/head/hats/New()
..()
var/hats = list()
hats["hat, boatsman"] = /obj/item/clothing/head/boaterhat
hats["hat, bowler"] = /obj/item/clothing/head/bowler
hats["hat, fez"] = /obj/item/clothing/head/fez
hats["hat, tophat"] = /obj/item/clothing/head/that
hats["hat, feather trilby"] = /obj/item/clothing/head/feathertrilby
hats["hat, fedora"] = /obj/item/clothing/head/fedora
hats["hat, beaver"] = /obj/item/clothing/head/beaverhat
hats["hat, cowboy"] = /obj/item/clothing/head/cowboy
hats["hat, wide-brimmed cowboy"] = /obj/item/clothing/head/cowboy/wide
hats["hat, sombrero"] = /obj/item/clothing/head/sombrero
gear_tweaks += new/datum/gear_tweak/path(hats)
/datum/gear/head/philosopher_wig
display_name = "natural philosopher's wig"
path = /obj/item/clothing/head/philosopher_wig
/datum/gear/head/ushanka
display_name = "ushanka"
path = /obj/item/clothing/head/ushanka
/datum/gear/head/hijab
display_name = "hijab selection"
path = /obj/item/clothing/head/hijab
@@ -127,3 +130,17 @@
hijab["blue hijab"] = /obj/item/clothing/head/hijab/blue
gear_tweaks += new/datum/gear_tweak/path(hijab)
/datum/gear/head/surgical
display_name = "surgical cap selection"
path = /obj/item/clothing/head/surgery/blue
allowed_roles = list("Scientist","Chief Medical Officer","Medical Doctor","Geneticist","Chemist","Paramedic","Nursing Intern","Xenobiologist","Roboticist","Research Director","Detective")
/datum/gear/head/surgical/New()
..()
var/surgical = list()
surgical["surgical cap, purple"] = /obj/item/clothing/head/surgery/purple
surgical["surgical cap, blue"] = /obj/item/clothing/head/surgery/blue
surgical["surgical cap, green"] = /obj/item/clothing/head/surgery/green
surgical["surgical cap, black"] = /obj/item/clothing/head/surgery/black
gear_tweaks += new/datum/gear_tweak/path(surgical)
code/modules/client/preference_setup/loadout/loadout_suit.dm
+6 -2
View File
@@ -79,6 +79,10 @@
display_name = "track jacket"
path = /obj/item/clothing/suit/storage/toggle/tracksuit
/datum/gear/suit/ian
display_name = "worn shirt"
path = /obj/item/clothing/suit/ianshirt
/datum/gear/suit/winter
display_name = "winter coat"
path = /obj/item/clothing/suit/storage/hooded/wintercoat
@@ -101,7 +105,7 @@
/datum/gear/suit/winter/medical
display_name = "winter coat, medical"
path = /obj/item/clothing/suit/storage/hooded/wintercoat/medical
allowed_roles = list("Chief Medical Officer","Medical Doctor","Paramedic","Nursing Intern","Psychiatrist","Chemist",)
allowed_roles = list("Chief Medical Officer","Medical Doctor","Paramedic","Nursing Intern","Psychiatrist","Chemist")
/datum/gear/suit/winter/engineering
display_name = "winter coat, engineering"
@@ -126,4 +130,4 @@
/datum/gear/suit/winter/mining
display_name = "winter coat, mining"
path = /obj/item/clothing/suit/storage/hooded/wintercoat/miner
allowed_roles = list("Quartermaster","Head of Personnel","Shaft Miner")
allowed_roles = list("Quartermaster","Head of Personnel","Shaft Miner")
code/modules/client/preference_setup/loadout/loadout_uniform.dm
+24 -26
View File
@@ -5,18 +5,10 @@
slot = slot_w_uniform
sort_category = "Uniforms and Casual Dress"
/datum/gear/uniform/cheongsam
display_name = "cheongsam, white"
path = /obj/item/clothing/under/cheongsam
/datum/gear/uniform/kilt
display_name = "kilt"
path = /obj/item/clothing/under/kilt
/datum/gear/uniform/jumpskirt
display_name = "jumpskirt, black"
path = /obj/item/clothing/under/blackjumpskirt
/datum/gear/uniform/jumpsuit
display_name = "generic jumpsuits"
path = /obj/item/clothing/under/color/grey
@@ -46,16 +38,17 @@
gear_tweaks += new/datum/gear_tweak/path(jumpsuit)
/datum/gear/uniform/skirt
display_name = "plaid skirt, blue"
display_name = "skirt selection"
path = /obj/item/clothing/under/dress/plaid_blue
/datum/gear/uniform/skirt/purple
display_name = "plaid skirt, purple"
path = /obj/item/clothing/under/dress/plaid_purple
/datum/gear/uniform/skirt/red
display_name = "plaid skirt, red"
path = /obj/item/clothing/under/dress/plaid_red
/datum/gear/uniform/skirt/New()
..()
var/skirts = list()
skirts["plaid skirt, blue"] = /obj/item/clothing/under/dress/plaid_blue
skirts["plaid skirt, purple"] = /obj/item/clothing/under/dress/plaid_purple
skirts["plaid skirt, red"] = /obj/item/clothing/under/dress/plaid_red
skirts["jumpskirt, black"] = /obj/item/clothing/under/blackjumpskirt
gear_tweaks += new/datum/gear_tweak/path(skirts)
/datum/gear/uniform/suit
display_name = "suit selection"
@@ -87,7 +80,7 @@
/datum/gear/uniform/scrubs
display_name = "scrubs selection"
path = /obj/item/clothing/under/rank/medical/black
allowed_roles = list("Scientist","Chief Medical Officer","Medical Doctor","Geneticist","Paramedic","Nursing Intern","Xenobiologist","Roboticist","Research Director","Detective",)
allowed_roles = list("Scientist","Chief Medical Officer","Medical Doctor","Chemist","Geneticist","Paramedic","Nursing Intern","Xenobiologist","Roboticist","Research Director","Detective")
/datum/gear/uniform/scrubs/New()
..()
@@ -98,17 +91,22 @@
scrubs["scrubs, purple"] = /obj/item/clothing/under/rank/medical/purple
gear_tweaks += new/datum/gear_tweak/path(scrubs)
/datum/gear/uniform/sundress
display_name = "sundress"
/datum/gear/uniform/dress
display_name = "dress selection"
path = /obj/item/clothing/under/sundress
/datum/gear/uniform/sundress/white
display_name = "sundress, white"
path = /obj/item/clothing/under/sundress_white
/datum/gear/uniform/dress_fire
display_name = "flame dress"
path = /obj/item/clothing/under/dress/dress_fire
/datum/gear/uniform/dress/New()
..()
var/dress = list()
dress["sundress"] = /obj/item/clothing/under/sundress
dress["sundress, white"] = /obj/item/clothing/under/sundress_white
dress["dress, flame"] = /obj/item/clothing/under/dress/dress_fire
dress["dress, green"] = /obj/item/clothing/under/dress/dress_green
dress["dress, orange"] = /obj/item/clothing/under/dress/dress_orange
dress["dress, pink"] = /obj/item/clothing/under/dress/dress_pink
dress["dress, yellow"] = /obj/item/clothing/under/dress/dress_yellow
dress["cheongsam, white"] = /obj/item/clothing/under/cheongsam
gear_tweaks += new/datum/gear_tweak/path(dress)
/datum/gear/uniform/uniform_captain
display_name = "uniform, captain's dress"
code/modules/clothing/chameleon.dm
+7 -5
View File
@@ -50,7 +50,7 @@
/obj/item/clothing/under/chameleon/New()
..()
if(!clothing_choices)
var/blocked = list(src.type, /obj/item/clothing/under/cloud, /obj/item/clothing/under/gimmick)//Prevent infinite loops and bad jumpsuits.
var/blocked = list(src.type, /obj/item/clothing/under/gimmick, /obj/item/clothing/under/rank/centcom_officer/bst)//Prevent infinite loops and bad jumpsuits.
clothing_choices = generate_chameleon_choices(/obj/item/clothing/under, blocked)
/obj/item/clothing/under/chameleon/emp_act(severity)
@@ -158,7 +158,7 @@
/obj/item/clothing/shoes/chameleon/New()
..()
if(!clothing_choices)
var/blocked = list(src.type, /obj/item/clothing/shoes/syndigaloshes, /obj/item/clothing/shoes/cyborg)//prevent infinite loops and bad shoes.
var/blocked = list(src.type, /obj/item/clothing/shoes/syndigaloshes, /obj/item/clothing/shoes/cyborg, /obj/item/clothing/shoes/black/bst)//prevent infinite loops and bad shoes.
clothing_choices = generate_chameleon_choices(/obj/item/clothing/shoes, blocked)
/obj/item/clothing/shoes/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.
@@ -233,11 +233,12 @@
desc = "It looks like a pair of gloves, but it seems to have a small dial inside."
origin_tech = list(TECH_ILLEGAL = 3)
var/global/list/clothing_choices
/obj/item/clothing/gloves/chameleon/New()
..()
if(!clothing_choices)
clothing_choices = generate_chameleon_choices(/obj/item/clothing/gloves, list(src.type))
var/blocked = list(src.type, /obj/item/clothing/gloves/swat/bst)
clothing_choices = generate_chameleon_choices(/obj/item/clothing/gloves, blocked)
/obj/item/clothing/gloves/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 = "black gloves"
@@ -307,7 +308,8 @@
/obj/item/clothing/glasses/chameleon/New()
..()
if(!clothing_choices)
clothing_choices = generate_chameleon_choices(/obj/item/clothing/glasses, list(src.type))
var/blocked = list(src.type, /obj/item/clothing/glasses/sunglasses/bst)
clothing_choices = generate_chameleon_choices(/obj/item/clothing/glasses, blocked)
/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"
code/modules/clothing/gloves/miscellaneous.dm
+16 -8
View File
@@ -44,14 +44,6 @@
siemens_coefficient = 1.0 //thin latex gloves, much more conductive than fabric gloves (basically a capacitor for AC)
permeability_coefficient = 0.01
germ_level = 0
/obj/item/clothing/gloves/botanic_leather
desc = "These leather work gloves protect against thorns, barbs, prickles, spikes and other harmful objects of floral origin."
name = "botanist's leather gloves"
icon_state = "leather"
item_state = "ggloves"
permeability_coefficient = 0.05
siemens_coefficient = 0.50 //thick work gloves
/obj/item/clothing/gloves/latex/unathi
name = "unathi latex gloves"
@@ -62,6 +54,22 @@
name = "tajaran latex gloves"
desc = "Sterile latex gloves. Designed for Tajara use."
species_restricted = list("Tajara")
/obj/item/clothing/gloves/botanic_leather
desc = "These leather work gloves protect against thorns, barbs, prickles, spikes and other harmful objects of floral origin."
name = "leather gloves"
icon_state = "leather"
item_state = "ggloves"
permeability_coefficient = 0.05
siemens_coefficient = 0.50 //thick work gloves
/obj/item/clothing/gloves/botanic_leather/unathi
name = "unathi leather gloves"
species_restricted = list("Unathi")
/obj/item/clothing/gloves/botanic_leather/tajara
name = "tajaran leather gloves"
species_restricted = list("Tajara")
/obj/item/clothing/gloves/watch
desc = "A small wristwatch, capable of telling time."
code/modules/clothing/head/jobs.dm
+4 -1
View File
@@ -121,8 +121,11 @@
desc = "A cap surgeons wear during operations. Keeps their hair from tickling your internal organs. This one is dark green."
icon_state = "surgcap_green"
//Detective
/obj/item/clothing/head/surgery/black
desc = "A cap surgeons wear during operations. Keeps their hair from tickling your internal organs. This one is black."
icon_state = "surgcap_black"
//Detective
/obj/item/clothing/head/det
name = "fedora"
code/modules/clothing/head/misc.dm
+17 -1
View File
@@ -289,4 +289,20 @@
name = "blue hijab"
icon = 'icons/obj/clothing/hijabs.dmi'
icon_state = "hijab_blue"
item_state = "hijab_blue"
item_state = "hijab_blue"
/obj/item/clothing/head/cowboy
name = "cowboy hat"
desc = "A wide-brimmed hat, in the prevalent style of the frontier."
icon_state = "cowboyhat"
body_parts_covered = 0
/obj/item/clothing/head/cowboy/wide
name = "wide-brimmed cowboy hat"
icon_state = "cowboy_wide"
/obj/item/clothing/head/sombrero
name = "sombrero"
desc = "You can practically taste the fiesta."
icon_state = "sombrero"
body_parts_covered = 0
code/modules/clothing/masks/boxing.dm
+3 -3
View File
@@ -16,7 +16,7 @@
w_class = 2
/obj/item/clothing/mask/luchador
name = "Luchador Mask"
name = "luchador mask"
desc = "Worn by robust fighters, flying high to defeat their foes!"
icon_state = "luchag"
item_state = "luchag"
@@ -26,13 +26,13 @@
siemens_coefficient = 3.0
/obj/item/clothing/mask/luchador/tecnicos
name = "Tecnicos Mask"
name = "tecnicos mask"
desc = "Worn by robust fighters who uphold justice and fight honorably."
icon_state = "luchador"
item_state = "luchador"
/obj/item/clothing/mask/luchador/rudos
name = "Rudos Mask"
name = "rudos mask"
desc = "Worn by robust fighters who are willing to do anything to win."
icon_state = "luchar"
item_state = "luchar"
code/modules/clothing/masks/miscellaneous.dm
+1 -1
View File
@@ -47,7 +47,7 @@
body_parts_covered = 0
/obj/item/clothing/mask/snorkel
name = "Snorkel"
name = "snorkel"
desc = "For the Swimming Savant."
icon_state = "snorkel"
flags_inv = HIDEFACE
code/modules/clothing/spacesuits/rig/suits/ert.dm
+3 -1
View File
@@ -79,6 +79,7 @@
suit_type = "heavy asset protection"
icon_state = "asset_protection_rig"
armor = list(melee = 60, bullet = 60, laser = 60,energy = 40, bomb = 50, bio = 100, rad = 100)
siemens_coefficient = 0
emp_protection = 50
initial_modules = list(
@@ -86,8 +87,9 @@
/obj/item/rig_module/maneuvering_jets,
/obj/item/rig_module/grenade_launcher,
/obj/item/rig_module/vision/multi,
/obj/item/rig_module/mounted/egun,
/obj/item/rig_module/mounted/pulse,
/obj/item/rig_module/chem_dispenser/combat,
/obj/item/rig_module/chem_dispenser/injector,
/obj/item/rig_module/device/plasmacutter,
/obj/item/rig_module/device/rcd,
/obj/item/rig_module/datajack
code/modules/clothing/under/accessories/armband.dm
-1
View File
@@ -38,7 +38,6 @@
name = "synthetic intelligence movement armband"
desc = "An armband, signifying membership of the Synthetic Intelligence Movement. It's white, with a brown stripe that appears to look like an active positronic brain."
icon_state = "movement"
slot = "armband"
/obj/item/clothing/accessory/armband/atlas
name = "atlas armband"
code/modules/clothing/under/jobs/engineering.dm
-6
View File
@@ -28,9 +28,3 @@
icon_state = "robotics"
item_state = "bl_suit"
worn_state = "robotics"
/obj/item/clothing/under/rank/roboticist/skirt
desc = "It's a slimming black jumpskirt with reinforced seams; great for industrial work."
name = "roboticist's jumpskirt"
icon_state = "roboticsf"
worn_state = "roboticsf"
code/modules/clothing/under/miscellaneous.dm
-7
View File
@@ -166,12 +166,6 @@
item_state = "rainbow"
worn_state = "rainbow"
/obj/item/clothing/under/cloud
name = "cloud"
desc = "cloud"
icon_state = "cloud"
worn_state = "cloud"
/obj/item/clothing/under/psysuit
name = "dark undersuit"
desc = "A thick, layered grey undersuit lined with power cables. Feels a little like wearing an electrical storm."
@@ -344,7 +338,6 @@
item_state = "p_suit"
worn_state = "dress_saloon"
/obj/item/clothing/under/dress/dress_cap
name = "captain's dress uniform"
desc = "Feminine fashion for the style concious captain."
code/modules/mob/living/carbon/human/species/station/station.dm
+1
View File
@@ -185,6 +185,7 @@
spawn_flags = CAN_JOIN | IS_WHITELISTED
appearance_flags = HAS_HAIR_COLOR | HAS_LIPS | HAS_UNDERWEAR | HAS_SKIN_COLOR | HAS_SOCKS
flags = NO_SLIP
flesh_color = "#8CD7A3"
blood_color = "#1D2CBF"
code/modules/mob/living/carbon/metroid/items.dm
+1 -1
View File
@@ -268,7 +268,7 @@
var/mob/living/carbon/human/G = new(src.loc)
G.set_species("Golem")
G.key = ghost.key
G << "You are an adamantine golem. You move slowly, but are highly resistant to heat and cold as well as blunt trauma. You are unable to wear clothes, but can still use most tools. Serve [user], and assist them in completing their goals at any cost."
G << "You are an adamantine golem. You move slowly, but are highly resistant to heat and cold as well as blunt trauma. Serve [user], and assist them in completing their goals at any cost."
qdel(src)
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Dispenser.dm
+3 -1
View File
@@ -117,7 +117,9 @@
if(alien == IS_DIONA)
return //Diona can gain nutrients, but don't get drunk or suffer other effects
if(isunathi(M))//unathi are poisoned by alcohol as well
M.adjustToxLoss(2.5 * removed * (strength / 100))
var/quantity = (strength / 100) * removed
M.intoxication += quantity
code/modules/research/xenoarchaeology/tools/anomaly_suit.dm
+4 -4
View File
@@ -1,21 +1,21 @@
//changes: rad protection up to 100 from 20/50 respectively
/obj/item/clothing/suit/bio_suit/anomaly
name = "Anomaly suit"
name = "anomaly suit"
desc = "A sealed bio suit capable of insulating against exotic alien energies."
icon_state = "engspace_suit"
item_state = "engspace_suit"
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 100, rad = 100)
/obj/item/clothing/head/bio_hood/anomaly
name = "Anomaly hood"
name = "anomaly hood"
desc = "A sealed bio hood capable of insulating against exotic alien energies."
icon_state = "engspace_helmet"
item_state = "engspace_helmet"
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 100, rad = 100)
/obj/item/clothing/suit/space/anomaly
name = "Excavation suit"
name = "excavation suit"
desc = "A pressure resistant excavation suit partially capable of insulating against exotic alien energies."
icon_state = "cespace_suit"
item_state = "cespace_suit"
@@ -23,7 +23,7 @@
allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/device/suit_cooling_unit)
/obj/item/clothing/head/helmet/space/anomaly
name = "Excavation hood"
name = "excavation hood"
desc = "A pressure resistant excavation hood partially capable of insulating against exotic alien energies."
icon_state = "cespace_helmet"
item_state = "cespace_helmet"
code/modules/spells/artifacts.dm
+6 -17
View File
@@ -54,13 +54,16 @@
throw_speed = 5
throw_range = 10
w_class = 5
flags = NOBLOODY
slot_flags = SLOT_BELT
origin_tech = list(TECH_COMBAT = 8, TECH_MATERIAL = 8)
attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
hitsound = 'sound/weapons/bladeslice.ogg'
sharp = 1
edge = 1
slot_flags = SLOT_BELT
base_reflectchance = 60
base_block_chance = 60
can_block_bullets = 1
shield_power = 150
/obj/item/weapon/melee/energy/wizard/activate(mob/living/user)
..()
@@ -90,23 +93,9 @@
return 1
/* //commented until issues with sparks and sword blocking updates are merged
/obj/item/weapon/melee/energy/wizard/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack")
if(active && default_parry_check(user, attacker, damage_source) && prob(50))
user.visible_message("<span class='danger'>\The [user] parries [attack_text] with \the [src]!</span>")
var/datum/effect/effect/system/spark_spread/spark_system = new /datum/effect/effect/system/spark_spread()
spark_system.set_up(5, 0, user.loc)
spark_system.start()
playsound(user.loc, 'sound/weapons/punchmiss.ogg', 50, 1)
return 1
return 0
*/
//skeleton weapons and armor
/obj/item/clothing/suit/bone
/obj/item/clothing/suit/armor/bone
name = "bone armor"
desc = "A rudimentary armor made of bones of several creatures."
icon = 'icons/obj/necromancer.dmi'
code/modules/spells/targeted/necromancer_spells.dm
+2 -2
View File
@@ -111,14 +111,14 @@
F.faction = usr.faction
if(C.mob && C.mob.mind)
C.mob.mind.transfer_to(F)
F << "<B>You are skeleton minion to [usr], he is your master. Aid your master don't matter what, you have no free will.</B>"
F << "<B>You are a skeleton minion to [usr], they are your master. Obey and protect your master at all costs, you have no free will.</B>"
//equips the skeleton war gear
F.equip_to_slot_or_del(new /obj/item/clothing/under/gladiator(F), slot_w_uniform)
F.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(F), slot_shoes)
F.equip_to_slot_or_del(new /obj/item/weapon/material/twohanded/spear/bone(F), slot_back)
F.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/bone(F), slot_head)
F.equip_to_slot_or_del(new /obj/item/clothing/suit/bone(F), slot_wear_suit)
F.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/bone(F), slot_wear_suit)
/spell/targeted/raise_dead/proc/get_player()
for(var/mob/O in dead_mob_list)