Merge pull request #3505 from Dhaeleena/Somecat

Winter boots
This commit is contained in:
Anewbe
2017-07-09 17:13:27 -05:00
committed by GitHub
12 changed files with 124 additions and 1 deletions

View File

@@ -21,6 +21,7 @@
new /obj/item/clothing/under/rank/cargotech/jeans(src)
new /obj/item/clothing/under/rank/cargotech/jeans/female(src)
new /obj/item/clothing/suit/storage/hooded/wintercoat/cargo(src)
new /obj/item/clothing/shoes/boots/winter/supply(src)
new /obj/item/clothing/shoes/black(src)
new /obj/item/device/radio/headset/headset_cargo(src)
new /obj/item/device/radio/headset/headset_cargo/alt(src)
@@ -62,4 +63,5 @@
new /obj/item/clothing/glasses/meson(src)
new /obj/item/clothing/head/soft(src)
new /obj/item/clothing/suit/storage/hooded/wintercoat/cargo(src)
new /obj/item/clothing/shoes/boots/winter/supply(src)
return

View File

@@ -36,6 +36,7 @@
new /obj/item/device/flash(src)
new /obj/item/taperoll/engineering(src)
new /obj/item/clothing/suit/storage/hooded/wintercoat/engineering(src)
new /obj/item/clothing/shoes/boots/winter/engineering(src)
new /obj/item/weapon/tank/emergency/oxygen/engi(src)
return
@@ -127,6 +128,7 @@
new /obj/item/weapon/cartridge/engineering(src)
new /obj/item/taperoll/engineering(src)
new /obj/item/clothing/suit/storage/hooded/wintercoat/engineering(src)
new /obj/item/clothing/shoes/boots/winter/engineering(src)
new /obj/item/weapon/tank/emergency/oxygen/engi(src)
return
@@ -162,5 +164,6 @@
new /obj/item/weapon/cartridge/atmos(src)
new /obj/item/taperoll/atmos(src)
new /obj/item/clothing/suit/storage/hooded/wintercoat/engineering/atmos(src)
new /obj/item/clothing/shoes/boots/winter/atmos(src)
new /obj/item/weapon/tank/emergency/oxygen/engi(src)
return

View File

@@ -25,5 +25,7 @@
new /obj/item/weapon/material/hatchet(src)
new /obj/item/weapon/wirecutters/clippers(src)
new /obj/item/weapon/reagent_containers/spray/plantbgone(src)
new /obj/item/clothing/suit/storage/hooded/wintercoat/hydro(src)
new /obj/item/clothing/shoes/boots/winter/hydro(src)
// new /obj/item/weapon/bee_net(src) //No more bees, March 2014
return

View File

@@ -112,6 +112,7 @@
new /obj/item/device/radio/headset/headset_med(src)
new /obj/item/device/radio/headset/headset_med/alt(src)
new /obj/item/clothing/suit/storage/hooded/wintercoat/medical(src)
new /obj/item/clothing/shoes/boots/winter/medical(src)
new /obj/item/weapon/storage/box/freezer(src)
new /obj/item/weapon/storage/box/freezer(src)
new /obj/item/weapon/storage/box/freezer(src)
@@ -204,6 +205,7 @@
new /obj/item/device/flash(src)
new /obj/item/weapon/reagent_containers/hypospray(src)
new /obj/item/clothing/suit/storage/hooded/wintercoat/medical(src)
new /obj/item/clothing/shoes/boots/winter/medical(src)
new /obj/item/weapon/storage/box/freezer(src)
new /obj/item/clothing/mask/gas(src)
return

View File

@@ -18,6 +18,8 @@
new /obj/item/device/radio/headset/headset_sci(src)
new /obj/item/weapon/tank/air(src)
new /obj/item/clothing/mask/gas(src)
new /obj/item/clothing/suit/storage/hooded/wintercoat/science(src)
new /obj/item/clothing/shoes/boots/winter/science(src)
return
@@ -49,4 +51,6 @@
new /obj/item/weapon/tank/air(src)
new /obj/item/clothing/mask/gas(src)
new /obj/item/device/flash(src)
new /obj/item/clothing/suit/storage/hooded/wintercoat/science(src)
new /obj/item/clothing/shoes/boots/winter/science(src)
return

View File

@@ -129,6 +129,7 @@
new /obj/item/weapon/melee/telebaton(src)
new /obj/item/clothing/head/beret/sec/corporate/hos(src)
new /obj/item/clothing/suit/storage/hooded/wintercoat/security(src)
new /obj/item/clothing/shoes/boots/winter/security(src)
new /obj/item/device/flashlight/maglight(src)
new /obj/item/clothing/mask/gas/half(src)
return
@@ -175,6 +176,7 @@
new /obj/item/weapon/storage/box/holobadge(src)
new /obj/item/clothing/head/beret/sec/corporate/warden(src)
new /obj/item/clothing/suit/storage/hooded/wintercoat/security(src)
new /obj/item/clothing/shoes/boots/winter/security(src)
new /obj/item/device/flashlight/maglight(src)
new /obj/item/device/megaphone(src)
new /obj/item/clothing/mask/gas/half(src)
@@ -221,6 +223,7 @@
new /obj/item/weapon/gun/energy/taser(src)
new /obj/item/weapon/cell/device/weapon(src)
new /obj/item/clothing/suit/storage/hooded/wintercoat/security(src)
new /obj/item/clothing/shoes/boots/winter/security(src)
new /obj/item/device/flashlight/maglight(src)
return

View File

@@ -266,6 +266,9 @@
new /obj/item/clothing/suit/storage/hooded/wintercoat/engineering/atmos(src)
new /obj/item/clothing/suit/storage/hooded/wintercoat/engineering/atmos(src)
new /obj/item/clothing/suit/storage/hooded/wintercoat/engineering/atmos(src)
new /obj/item/clothing/shoes/boots/winter/atmos(src)
new /obj/item/clothing/shoes/boots/winter/atmos(src)
new /obj/item/clothing/shoes/boots/winter/atmos(src)
return
/obj/structure/closet/wardrobe/engineering_yellow
@@ -296,6 +299,9 @@
new /obj/item/clothing/suit/storage/hooded/wintercoat/engineering(src)
new /obj/item/clothing/suit/storage/hooded/wintercoat/engineering(src)
new /obj/item/clothing/suit/storage/hooded/wintercoat/engineering(src)
new /obj/item/clothing/shoes/boots/winter/engineering(src)
new /obj/item/clothing/shoes/boots/winter/engineering(src)
new /obj/item/clothing/shoes/boots/winter/engineering(src)
new /obj/item/clothing/shoes/boots/workboots(src)
new /obj/item/clothing/shoes/boots/workboots(src)
new /obj/item/clothing/shoes/boots/workboots(src)
@@ -361,6 +367,7 @@
new /obj/item/clothing/shoes/slippers(src)
new /obj/item/clothing/shoes/slippers(src)
new /obj/item/clothing/suit/storage/hooded/wintercoat/science(src)
new /obj/item/clothing/shoes/boots/winter/science(src)
new /obj/item/weapon/storage/backpack/toxins(src)
new /obj/item/weapon/storage/backpack/toxins(src)
new /obj/item/weapon/storage/backpack/satchel/tox(src)
@@ -486,6 +493,8 @@
new /obj/item/clothing/mask/surgical(src)
new /obj/item/clothing/suit/storage/hooded/wintercoat/medical(src)
new /obj/item/clothing/suit/storage/hooded/wintercoat/medical(src)
new /obj/item/clothing/shoes/boots/winter/medical(src)
new /obj/item/clothing/shoes/boots/winter/medical(src)
return
@@ -644,6 +653,7 @@
new /obj/item/clothing/head/caphat/formal(src)
new /obj/item/clothing/under/captainformal(src)
new /obj/item/clothing/suit/storage/hooded/wintercoat/captain(src)
new /obj/item/clothing/shoes/boots/winter/command(src)
new /obj/item/clothing/head/beret/centcom/captain(src)
new /obj/item/clothing/under/gimmick/rank/captain/suit(src)
new /obj/item/clothing/under/gimmick/rank/captain/suit/skirt(src)

View File

@@ -193,4 +193,53 @@
/datum/gear/shoes/heels/New()
..()
gear_tweaks = list(gear_tweak_free_color_choice)
gear_tweaks = list(gear_tweak_free_color_choice)
/datum/gear/shoes/boots/winter
display_name = "winter boots"
path = /obj/item/clothing/shoes/boots/winter
/datum/gear/shoes/boots/winter/security
display_name = "security winter boots"
path = /obj/item/clothing/shoes/boots/winter/security
allowed_roles = list("Security Officer", "Head of Security", "Warden", "Detective")
/datum/gear/shoes/boots/winter/science
display_name = "science winter boots"
path = /obj/item/clothing/shoes/boots/winter/science
allowed_roles = list("Research Director","Scientist", "Roboticist", "Xenobiologist")
/datum/gear/shoes/boots/winter/command
display_name = "colony director's winter boots"
path = /obj/item/clothing/shoes/boots/winter/command
allowed_roles = list("Colony Director")
/datum/gear/shoes/boots/winter/engineering
display_name = "engineering winter boots"
path = /obj/item/clothing/shoes/boots/winter/engineering
allowed_roles = list("Chief Engineer","Atmospheric Technician", "Station Engineer")
/datum/gear/shoes/boots/winter/atmos
display_name = "atmospherics winter boots"
path = /obj/item/clothing/shoes/boots/winter/atmos
allowed_roles = list("Chief Engineer", "Atmospheric Technician")
/datum/gear/shoes/boots/winter/medical
display_name = "medical winter boots"
path = /obj/item/clothing/shoes/boots/winter/medical
allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist")
/datum/gear/shoes/boots/winter/mining
display_name = "mining winter boots"
path = /obj/item/clothing/shoes/boots/winter/mining
allowed_roles = list("Shaft Miner")
/datum/gear/shoes/boots/winter/supply
display_name = "supply winter boots"
path = /obj/item/clothing/shoes/boots/winter/supply
allowed_roles = list("Quartermaster","Cargo Technician")
/datum/gear/shoes/boots/winter/hydro
display_name = "hydroponics winter boots"
path = /obj/item/clothing/shoes/boots/winter/hydro
allowed_roles = list("Botanist", "Xenobiologist")

View File

@@ -47,6 +47,52 @@
heat_protection = FEET|LEGS
max_heat_protection_temperature = SHOE_MAX_HEAT_PROTECTION_TEMPERATURE
/obj/item/clothing/shoes/boots/winter/security
name = "security winter boots"
desc = "A pair of winter boots. These ones are lined with grey fur, and coloured an angry red."
icon_state = "winterboots_sec"
armor = list(melee = 30, bullet = 10, laser = 10, energy = 15, bomb = 20, bio = 0, rad = 0)
/obj/item/clothing/shoes/boots/winter/science
name = "science winter boots"
desc = "A pair of winter boots. These ones are lined with white fur, and are trimmed with scientific advancement!"
icon_state = "winterboots_sci"
/obj/item/clothing/shoes/boots/winter/command
name = "colony director's winter boots"
desc = "A pair of winter boots. They're lined with dark fur, and trimmed in the colours of superiority."
icon_state = "winterboots_cap"
/obj/item/clothing/shoes/boots/winter/engineering
name = "engineering winter boots"
desc = "A pair of winter boots. These ones are lined with orange fur and are trimmed in the colours of disaster."
icon_state = "winterboots_eng"
/obj/item/clothing/shoes/boots/winter/atmos
name = "atmospherics winter boots"
desc = "A pair of winter boots. These ones are lined with beige fur, and are trimmed in breath taking colours."
icon_state = "winterboots_atmos"
/obj/item/clothing/shoes/boots/winter/medical
name = "medical winter boots"
desc = "A pair of winter boots. These ones are lined with white fur, and are trimmed like 30cc of dexalin"
icon_state = "winterboots_med"
/obj/item/clothing/shoes/boots/winter/mining
name = "mining winter boots"
desc = "A pair of winter boots. These ones are lined with greyish fur, and their trim is golden!"
icon_state = "winterboots_mining"
/obj/item/clothing/shoes/boots/winter/supply
name = "supply winter boots"
desc = "A pair of winter boots. These ones are lined with the galactic cargonia colors!"
icon_state = "winterboots_sup"
/obj/item/clothing/shoes/boots/winter/hydro
name = "hydroponics winter boots"
desc = "A pair of winter boots.These ones are lined with brown fur, and their trim is ambrosia green"
icon_state = "winterboots_hydro"
/obj/item/clothing/shoes/boots/tactical
name = "tactical boots"
desc = "Tan boots with extra padding and armor."

View File

@@ -27,6 +27,8 @@
new /obj/item/weapon/shovel(src)
new /obj/item/weapon/pickaxe(src)
new /obj/item/clothing/glasses/material(src)
new /obj/item/clothing/suit/storage/hooded/wintercoat/miner(src)
new /obj/item/clothing/shoes/boots/winter/mining(src)
/******************************Lantern*******************************/

Binary file not shown.

Before

Width:  |  Height:  |  Size: 40 KiB

After

Width:  |  Height:  |  Size: 41 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 27 KiB

After

Width:  |  Height:  |  Size: 30 KiB