cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into labcoat

Browse Source 
Conflicts:
	code/modules/clothing/suits/labcoat.dm
This should hopefully fix all that conflict going on. Hopefully.
This commit is contained in:
MagmaRam
2014-11-16 02:56:32 -05:00
parent 8d34ffe397 599cb247bc
commit cdec94c5a8
272 changed files with 2555 additions and 3432 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
code/modules/customitems/item_defines.dm
View File

@@ -865,6 +865,15 @@
icon_state = "mitlabcoat"
item_state = "mitlabcoat"
/obj/item/clothing/suit/storage/toggle/labcoat/fluff/epsilon //Devildabeast: Looping Song
name = "e UMi labcoat"
desc = "A suit that protects against minor chemical spills. Has a black stripe on the shoulder. The abbreviation \"e UMi\" is written on the back in bold text."
icon = 'icons/obj/custom_items.dmi'
icon_state = "labcoat_black_open"
icon_open = "labcoat_black_open"
icon_closed = "labcoat_black"
item_state = "labcoat_black"
/obj/item/clothing/suit/storage/det_suit/fluff/leatherjack //atomicdog92: Seth Sealis
name = "leather jacket"
desc = "A black leather coat, popular amongst punks, greasers, and other galactic scum."
@@ -1266,6 +1275,14 @@
icon_state = "digiboots"
species_restricted = null
/obj/item/clothing/shoes/jackboots/fluff/harmony_singh_1 //Bromuzl: Harmony Singh
name = "Springjacks"
desc = "A pair of highly modified jackboots in medical white, with some type of spring assembly on the ankle and heels, painted orange."
icon = 'icons/obj/custom_items.dmi'
icon_state = "springjacks"
item_state = "springjacks"
slowdown = SHOES_SLOWDOWN+1 //Slowing down because of her injured foot, these are for ease of pain so she can get off painkillers.
siemens_coefficient = 0.7 //copied from Jackboots under code/modules/clothing/shoes/miscellaneous.dm
//////////// Sets ////////////