shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Icon_override, Plasma weapon tweaks & gunlocker. AK-47 Summoning (#2759)

Browse Source 
* In hands of plasma weapons/tweaks

* Icon override states for all clothes

* a few compile issues ~

* Adds a new badmin button and plasma rifle case

* better cleanup of the sound effect

* Oh, these should've been deleted already.
This commit is contained in:
Poojawa
2017-09-16 04:29:22 -05:00
committed by GitHub
parent 54d28cadb0
commit 0eb8cf0235
30 changed files with 239 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/clothing/head/cit_hats.dm
+1
View File
@@ -4,3 +4,4 @@
icon = 'icons/obj/clothing/cit_hats.dmi'
icon_state = "hunter"
item_state = "hunter_worn"
icon_override = 'icons/mob/citadel/head.dmi'
code/modules/clothing/head/vg_hats.dm
+23 -5
View File
@@ -13,6 +13,7 @@
flags_1 = STOPSPRESSUREDMAGE_1
strip_delay = 80
dog_fashion = null
icon_override = 'icons/mob/citadel/head.dmi'
/obj/item/clothing/head/helmet/aviatorhelmet
name = "Aviator Helmet"
@@ -21,6 +22,7 @@
item_state = "aviator_helmet"
icon_state = "aviator_helmet"
icon = 'icons/obj/clothing/vg_clothes.dmi'
icon_override = 'icons/mob/citadel/head.dmi'
/obj/item/clothing/head/helmet/biker
name = "Biker's Helmet"
@@ -28,6 +30,7 @@
armor = list(melee = 25, bullet = 15, laser = 20, energy = 10, bomb = 10, bio = 0, rad = 0)
icon_state = "biker_helmet"
icon = 'icons/obj/clothing/vg_clothes.dmi'
icon_override = 'icons/mob/citadel/head.dmi'
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR
/obj/item/clothing/head/helmet/richard
@@ -36,6 +39,7 @@
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0)
icon_state = "richard"
icon = 'icons/obj/clothing/vg_clothes.dmi'
icon_override = 'icons/mob/citadel/head.dmi'
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR
/obj/item/clothing/head/helmet/megahelmet
@@ -44,6 +48,7 @@
icon_state = "megahelmet"
item_state = "megahelmet"
icon = 'icons/obj/clothing/vg_clothes.dmi'
icon_override = 'icons/mob/citadel/head.dmi'
siemens_coefficient = 1
/obj/item/clothing/head/helmet/protohelmet
@@ -52,6 +57,7 @@
icon_state = "protohelmet"
item_state = "protohelmet"
icon = 'icons/obj/clothing/vg_clothes.dmi'
icon_override = 'icons/mob/citadel/head.dmi'
siemens_coefficient = 1
/obj/item/clothing/head/helmet/megaxhelmet
@@ -60,7 +66,7 @@
icon_state = "megaxhelmet"
item_state = "megaxhelmet"
icon = 'icons/obj/clothing/vg_clothes.dmi'
siemens_coefficient = 1
icon_override = 'icons/mob/citadel/head.dmi'
/obj/item/clothing/head/helmet/joehelmet
name = "Sniper Helmet"
@@ -69,7 +75,7 @@
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR
item_state = "joehelmet"
icon = 'icons/obj/clothing/vg_clothes.dmi'
siemens_coefficient = 1
icon_override = 'icons/mob/citadel/head.dmi'
/obj/item/clothing/head/helmet/doomguy
name = "Doomguy's helmet"
@@ -78,8 +84,8 @@
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR
item_state = "doom"
icon = 'icons/obj/clothing/vg_clothes.dmi'
icon_override = 'icons/mob/citadel/head.dmi'
armor = list(melee = 50, bullet = 40, laser = 40,energy = 40, bomb = 5, bio = 0, rad = 0)
siemens_coefficient = 1
/obj/item/clothing/head/helmet/neorussian
name = "neo-Russian helmet"
@@ -87,6 +93,7 @@
icon_state = "nr_helmet"
item_state = "nr_helmet"
icon = 'icons/obj/clothing/vg_clothes.dmi'
icon_override = 'icons/mob/citadel/head.dmi'
/obj/item/clothing/head/stalhelm
@@ -95,20 +102,23 @@
icon_state = "stalhelm"
item_state = "stalhelm"
icon = 'icons/obj/clothing/vg_clothes.dmi'
icon_override = 'icons/mob/citadel/head.dmi'
/obj/item/clothing/head/panzer
name = "Panzer Cap"
desc = "Ein Hut passen nur für die größten Tanks."
desc = "Command any mech in style."
icon_state = "panzercap"
item_state = "panzercap"
icon = 'icons/obj/clothing/vg_clothes.dmi'
icon_override = 'icons/mob/citadel/head.dmi'
/obj/item/clothing/head/naziofficer
name = "Officer Cap"
desc = "Ein Hut von Offizieren in der Nazi-Partei getragen."
desc = "Style is all that matters."
icon_state = "officercap"
item_state = "officercap"
icon = 'icons/obj/clothing/vg_clothes.dmi'
icon_override = 'icons/mob/citadel/head.dmi'
/obj/item/clothing/head/russobluecamohat
@@ -124,6 +134,7 @@
icon_state = "russofurhat"
item_state = "russofurhat"
icon = 'icons/obj/clothing/vg_clothes.dmi'
icon_override = 'icons/mob/citadel/head.dmi'
/obj/item/clothing/head/squatter_hat
name = "slav squatter hat"
@@ -131,6 +142,7 @@
item_state = "squatter_hat"
icon = 'icons/obj/clothing/vg_clothes.dmi'
desc = "Cyka blyat."
icon_override = 'icons/mob/citadel/head.dmi'
/obj/item/clothing/head/snake
name = "snake head"
@@ -138,6 +150,7 @@
icon_state = "snakehead"
item_state = "snakehead"
icon = 'icons/obj/clothing/vg_clothes.dmi'
icon_override = 'icons/mob/citadel/head.dmi'
/obj/item/clothing/head/mummy_rags
name = "mummy rags"
@@ -146,6 +159,7 @@
item_state = "mummy"
item_color = "mummy"
icon = 'icons/obj/clothing/vg_clothes.dmi'
icon_override = 'icons/mob/citadel/head.dmi'
flags_inv = HIDEHAIR|HIDEFACE|HIDEEARS
/obj/item/clothing/head/clownpiece
@@ -154,6 +168,7 @@
icon_state = "clownpiece"
item_state = "clownpiece"
icon = 'icons/obj/clothing/vg_clothes.dmi'
icon_override = 'icons/mob/citadel/head.dmi'
/obj/item/clothing/head/mitre
name = "mitre"
@@ -161,6 +176,7 @@
icon_state = "mitre"
item_state = "mitre"
icon = 'icons/obj/clothing/vg_clothes.dmi'
icon_override = 'icons/mob/citadel/head.dmi'
/obj/item/clothing/head/tinfoil
name = "tinfoil hat"
@@ -168,6 +184,7 @@
icon_state = "foilhat"
item_state = "paper"
icon = 'icons/obj/clothing/vg_clothes.dmi'
icon_override = 'icons/mob/citadel/head.dmi'
siemens_coefficient = 2
/obj/item/clothing/head/celtic
@@ -176,3 +193,4 @@
icon_state = "celtic_crown"
item_state = "celtic_crown"
icon = 'icons/obj/clothing/vg_clothes.dmi'
icon_override = 'icons/mob/citadel/head.dmi'