cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-29 11:31:38 +00: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-18 19:05:25 -03: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

4
code/modules/client/preference_setup/loadout/loadout_accessories.dm
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()
..()

5
code/modules/client/preference_setup/loadout/loadout_eyes.dm
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"

2
code/modules/client/preference_setup/loadout/loadout_gloves.dm
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"

53
code/modules/client/preference_setup/loadout/loadout_head.dm
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)

8
code/modules/client/preference_setup/loadout/loadout_suit.dm
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")

50
code/modules/client/preference_setup/loadout/loadout_uniform.dm
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"