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

LOCAL SUNE PORTS... OH GOD WHAT HAPPENED

Browse Source 
That feel when you're in the 'Oh, well while I'm here...' mindset.
This commit is contained in:
Poojawa
2018-03-18 09:02:13 -05:00
parent 02c3f6d0a0
commit 796e22beac
91 changed files with 1477 additions and 1102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

871
code/modules/client/preferences.dm
View File

File diff suppressed because it is too large Load Diff

20
code/modules/clothing/glasses/vg_glasses.dm
View File

@@ -5,38 +5,38 @@
desc = "Strangely ancient technology used to help provide rudimentary eye cover. Enhanced shielding blocks many flashes, and the colored lenses let you see the world in purple."
name = "purple sunglasses"
icon_state = "sun_purple"
icon = 'icons/obj/clothing/vg_clothes.dmi'
icon_override = 'icons/mob/citadel/glasses.dmi'
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/glasses.dmi'
/obj/item/clothing/glasses/sunglasses/star
name = "star-shaped sunglasses"
desc = "Novelty sunglasses, both lenses are in the shape of a star."
icon_state = "sun_star"
icon = 'icons/obj/clothing/vg_clothes.dmi'
icon_override = 'icons/mob/citadel/glasses.dmi'
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/glasses.dmi'
/obj/item/clothing/glasses/sunglasses/rockstar
name = "red star-shaped sunglasses"
desc = "Novelty sunglasses with a fancy silver frame and two red-tinted star-shaped lenses. You should probably stomp on them and get a pair of normal ones."
icon_state = "sun_star_silver"
icon = 'icons/obj/clothing/vg_clothes.dmi'
icon_override = 'icons/mob/citadel/glasses.dmi'
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/glasses.dmi'
/obj/item/clothing/glasses/gglasses
name = "Green Glasses"
desc = "Forest green glasses, like the kind you'd wear when hatching a nasty scheme."
icon_state = "gglasses"
item_state = "gglasses"
icon = 'icons/obj/clothing/vg_clothes.dmi'
icon_override = 'icons/mob/citadel/glasses.dmi'
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/glasses.dmi'
/obj/item/clothing/glasses/welding/superior
name = "superior welding goggles"
desc = "Welding goggles made from more expensive materials, strangely smells like potatoes. Allows for better vision than normal goggles.."
icon_state = "rwelding-g"
item_state = "rwelding-g"
icon = 'icons/obj/clothing/vg_clothes.dmi'
icon_override = 'icons/mob/citadel/glasses.dmi'
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/glasses.dmi'
actions_types = list(/datum/action/item_action/toggle)
flash_protect = 2
tint = 1

18
code/modules/clothing/gloves/vg_gloves.dm
View File

@@ -5,49 +5,49 @@
icon_state = "bmgloves"
item_state = "bmgloves"
item_color = "bmgloves"
icon = 'icons/obj/clothing/vg_clothes.dmi'
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
obj/item/clothing/gloves/bikergloves
name = "Biker's Gloves"
icon_state = "biker-gloves"
item_state = "biker-gloves"
item_color = "bikergloves"
icon = 'icons/obj/clothing/vg_clothes.dmi'
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
/obj/item/clothing/gloves/megagloves
desc = "Uncomfortably bulky armored gloves."
name = "DRN-001 Gloves"
icon_state = "megagloves"
item_state = "megagloves"
icon = 'icons/obj/clothing/vg_clothes.dmi'
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
/obj/item/clothing/gloves/protogloves
desc = "Funcionally identical to the DRN-001 model's, but in red!"
name = "Prototype Gloves"
icon_state = "protogloves"
item_state = "protogloves"
icon = 'icons/obj/clothing/vg_clothes.dmi'
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
/obj/item/clothing/gloves/megaxgloves
desc = "An upgrade to the DRN-001's gauntlets, retains the uncomfortable armor, but comes with white gloves!"
name = "Maverick Hunter gloves"
icon_state = "megaxgloves"
item_state = "megaxgloves"
icon = 'icons/obj/clothing/vg_clothes.dmi'
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
/obj/item/clothing/gloves/joegloves
desc = "Large grey gloves, very similar to the Prototype's."
name = "Sniper Gloves"
icon_state = "joegloves"
item_state = "joegloves"
icon = 'icons/obj/clothing/vg_clothes.dmi'
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
/obj/item/clothing/gloves/doomguy
desc = ""
name = "Doomguy's gloves"
icon_state = "doom"
item_state = "doom"
icon = 'icons/obj/clothing/vg_clothes.dmi'
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
/obj/item/clothing/gloves/anchor_arms
name = "Anchor Arms"
@@ -60,11 +60,11 @@ obj/item/clothing/gloves/bikergloves
desc = "Utilizes a non-slip technology that allows you to never drop your precious bottles of vodka."
icon_state = "nr_gloves"
item_state = "nr_gloves"
icon = 'icons/obj/clothing/vg_clothes.dmi'
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
/obj/item/clothing/gloves/neorussian/fingerless
name = "neo-Russian fingerless gloves"
desc = "For these tense combat situations when you just have to pick your nose."
icon_state = "nr_fgloves"
item_state = "nr_fgloves"
icon = 'icons/obj/clothing/vg_clothes.dmi'
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'

4
code/modules/clothing/head/cit_hats.dm
View File

@@ -1,7 +1,7 @@
/obj/item/clothing/head/hunter
name = "hunter"
desc = "A basic hat for hunting things."
icon = 'icons/obj/clothing/cit_hats.dmi'
icon = 'modular_citadel/icons/obj/clothing/cit_hats.dmi'
icon_state = "hunter"
item_state = "hunter_worn"
icon_override = 'icons/mob/citadel/head.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/head.dmi'

86
code/modules/clothing/head/vg_hats.dm
View File

@@ -4,7 +4,7 @@
desc = "Judge, Jury, and Executioner."
icon_state = "dredd-helmet"
item_state = "dredd-helmet"
icon = 'icons/obj/clothing/vg_clothes.dmi'
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
armor = list(melee = 40, bullet = 30, laser = 30,energy = 30, bomb = 50, bio = 90, rad = 20, fire = 50, acid = 50)
cold_protection = HEAD
min_cold_protection_temperature = SPACE_HELM_MIN_TEMP_PROTECT
@@ -13,7 +13,7 @@
flags_1 = STOPSPRESSUREDMAGE_1
strip_delay = 80
dog_fashion = null
icon_override = 'icons/mob/citadel/head.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/head.dmi'
/obj/item/clothing/head/helmet/aviatorhelmet
name = "Aviator Helmet"
@@ -21,16 +21,16 @@
armor = list(melee = 25, bullet = 0, laser = 20, energy = 10, bomb = 10, bio = 0, rad = 0)
item_state = "aviator_helmet"
icon_state = "aviator_helmet"
icon = 'icons/obj/clothing/vg_clothes.dmi'
icon_override = 'icons/mob/citadel/head.dmi'
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/head.dmi'
/obj/item/clothing/head/helmet/biker
name = "Biker's Helmet"
desc = "This helmet should protect you from russians and masked vigilantes."
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'
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/head.dmi'
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR
/obj/item/clothing/head/helmet/richard
@@ -38,8 +38,8 @@
desc = "Do you like hurting people?"
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'
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/head.dmi'
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR
/obj/item/clothing/head/helmet/megahelmet
@@ -47,8 +47,8 @@
desc = "The helmet of the DRN-001 model. A simple, sturdy blue helmet."
icon_state = "megahelmet"
item_state = "megahelmet"
icon = 'icons/obj/clothing/vg_clothes.dmi'
icon_override = 'icons/mob/citadel/head.dmi'
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/head.dmi'
siemens_coefficient = 1
/obj/item/clothing/head/helmet/protohelmet
@@ -56,8 +56,8 @@
desc = "Shiny red helmet with white accents and a built in shaded visor that does absolutely nothing, nothing but look rad as hell."
icon_state = "protohelmet"
item_state = "protohelmet"
icon = 'icons/obj/clothing/vg_clothes.dmi'
icon_override = 'icons/mob/citadel/head.dmi'
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/head.dmi'
siemens_coefficient = 1
/obj/item/clothing/head/helmet/megaxhelmet
@@ -65,8 +65,8 @@
desc = "Heavily armored upgrade to the DRN-001 model's helmet, now comes with a pointless red crystal thing!"
icon_state = "megaxhelmet"
item_state = "megaxhelmet"
icon = 'icons/obj/clothing/vg_clothes.dmi'
icon_override = 'icons/mob/citadel/head.dmi'
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/head.dmi'
/obj/item/clothing/head/helmet/joehelmet
name = "Sniper Helmet"
@@ -74,8 +74,8 @@
icon_state = "joehelmet"
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR
item_state = "joehelmet"
icon = 'icons/obj/clothing/vg_clothes.dmi'
icon_override = 'icons/mob/citadel/head.dmi'
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/head.dmi'
/obj/item/clothing/head/helmet/doomguy
name = "Doomguy's helmet"
@@ -83,8 +83,8 @@
icon_state = "doom"
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR
item_state = "doom"
icon = 'icons/obj/clothing/vg_clothes.dmi'
icon_override = 'icons/mob/citadel/head.dmi'
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/head.dmi'
armor = list(melee = 50, bullet = 40, laser = 40,energy = 40, bomb = 5, bio = 0, rad = 0)
/obj/item/clothing/head/helmet/neorussian
@@ -92,8 +92,8 @@
desc = "This piece of equipment can double as a pillow, a bowl, an emergency toilet, and sometimes as a helmet."
icon_state = "nr_helmet"
item_state = "nr_helmet"
icon = 'icons/obj/clothing/vg_clothes.dmi'
icon_override = 'icons/mob/citadel/head.dmi'
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/head.dmi'
/obj/item/clothing/head/stalhelm
@@ -101,24 +101,24 @@
desc = "Ein Helm, um die Nazi-Interesse an fremden Raumstationen zu sichern."
icon_state = "stalhelm"
item_state = "stalhelm"
icon = 'icons/obj/clothing/vg_clothes.dmi'
icon_override = 'icons/mob/citadel/head.dmi'
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/head.dmi'
/obj/item/clothing/head/panzer
name = "Panzer Cap"
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'
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/head.dmi'
/obj/item/clothing/head/naziofficer
name = "Officer Cap"
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'
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/head.dmi'
/obj/item/clothing/head/russobluecamohat
@@ -126,31 +126,31 @@
desc = "A symbol of discipline, honor, and lots and lots of removal of some type of skewered food."
icon_state = "russobluecamohat"
item_state = "russobluecamohat"
icon = 'icons/obj/clothing/vg_clothes.dmi'
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
/obj/item/clothing/head/russofurhat
name = "russian fur hat"
desc = "Russian winter got you down? Maybe your enemy, but not you!"
icon_state = "russofurhat"
item_state = "russofurhat"
icon = 'icons/obj/clothing/vg_clothes.dmi'
icon_override = 'icons/mob/citadel/head.dmi'
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/head.dmi'
/obj/item/clothing/head/squatter_hat
name = "slav squatter hat"
icon_state = "squatter_hat"
item_state = "squatter_hat"
icon = 'icons/obj/clothing/vg_clothes.dmi'
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
desc = "Cyka blyat."
icon_override = 'icons/mob/citadel/head.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/head.dmi'
/obj/item/clothing/head/snake
name = "snake head"
desc = "Reenact acts of violence against reptiles, or sneak into a swamp unnoticed."
icon_state = "snakehead"
item_state = "snakehead"
icon = 'icons/obj/clothing/vg_clothes.dmi'
icon_override = 'icons/mob/citadel/head.dmi'
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/head.dmi'
/obj/item/clothing/head/mummy_rags
name = "mummy rags"
@@ -158,8 +158,8 @@
icon_state = "mummy"
item_state = "mummy"
item_color = "mummy"
icon = 'icons/obj/clothing/vg_clothes.dmi'
icon_override = 'icons/mob/citadel/head.dmi'
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/head.dmi'
flags_inv = HIDEHAIR|HIDEFACE|HIDEEARS
/obj/item/clothing/head/clownpiece
@@ -167,24 +167,24 @@
desc = "A purple polka-dotted jester's hat with yellow pompons."
icon_state = "clownpiece"
item_state = "clownpiece"
icon = 'icons/obj/clothing/vg_clothes.dmi'
icon_override = 'icons/mob/citadel/head.dmi'
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/head.dmi'
/obj/item/clothing/head/mitre
name = "mitre"
desc = "A funny hat worn by extremely boring people."
icon_state = "mitre"
item_state = "mitre"
icon = 'icons/obj/clothing/vg_clothes.dmi'
icon_override = 'icons/mob/citadel/head.dmi'
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/head.dmi'
/obj/item/clothing/head/tinfoil
name = "tinfoil hat"
desc = "There's no evidence that the security staff is NOT out to get you."
icon_state = "foilhat"
item_state = "paper"
icon = 'icons/obj/clothing/vg_clothes.dmi'
icon_override = 'icons/mob/citadel/head.dmi'
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/head.dmi'
siemens_coefficient = 2
/obj/item/clothing/head/celtic
@@ -192,5 +192,5 @@
desc = "According to legend, Celtic kings would use crowns like this one to shield their subjects from harsh winters back on Earth."
icon_state = "celtic_crown"
item_state = "celtic_crown"
icon = 'icons/obj/clothing/vg_clothes.dmi'
icon_override = 'icons/mob/citadel/head.dmi'
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/head.dmi'

12
code/modules/clothing/masks/vg_masks.dm
View File

@@ -2,19 +2,19 @@
name = "purple clown wig and mask"
desc = "Some pranksters are truly magical."
icon_state = "wizzclown"
icon = 'icons/obj/clothing/vg_clothes.dmi'
icon_override = 'icons/mob/citadel/masks.dmi'
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/masks.dmi'
/obj/item/clothing/mask/chapmask
name = "venetian mask"
desc = "A plain porcelain mask that covers the entire face. Standard attire for particularly unspeakable religions. The eyes are wide shut."
icon_state = "chapmask"
icon = 'icons/obj/clothing/vg_clothes.dmi'
icon_override = 'icons/mob/citadel/masks.dmi'
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/masks.dmi'
/obj/item/clothing/mask/neorussian
name = "neo-Russian mask"
desc = "Somehow, it makes you act and look way more polite than usual."
icon_state = "nr_mask"
icon = 'icons/obj/clothing/vg_clothes.dmi'
icon_override = 'icons/mob/citadel/masks.dmi'
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/masks.dmi'

68
code/modules/clothing/shoes/vg_shoes.dm
View File

@@ -4,24 +4,24 @@
desc = "A sturdy pair of leather shoes."
icon_state = "leather"
item_color = "leather"
icon = 'icons/obj/clothing/vg_clothes.dmi'
icon_override = 'icons/mob/citadel/head.dmi'
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/head.dmi'
/obj/item/clothing/shoes/magboots/deathsquad
desc = "Very expensive and advanced magnetic boots, used only by the elite during extravehicular activity to ensure the user remains safely attached to the vehicle."
name = "deathsquad magboots"
icon_state = "DS-magboots0"
magboot_state = "DS-magboots"
icon = 'icons/obj/clothing/vg_clothes.dmi'
icon_override = 'icons/mob/citadel/head.dmi'
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/head.dmi'
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF
/obj/item/clothing/shoes/magboots/atmos
desc = "Magnetic boots, often used during extravehicular activity to ensure the user remains safely attached to the vehicle. These are painted in the colors of an atmospheric technician."
name = "atmospherics magboots"
icon_state = "atmosmagboots0"
icon = 'icons/obj/clothing/vg_clothes.dmi'
icon_override = 'icons/mob/citadel/head.dmi'
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/head.dmi'
magboot_state = "atmosmagboots"
resistance_flags = FIRE_PROOF
@@ -29,96 +29,96 @@
name = "Simon's Shoes"
desc = "Simon's Shoes."
icon_state = "simonshoes"
icon = 'icons/obj/clothing/vg_clothes.dmi'
icon_override = 'icons/mob/citadel/head.dmi'
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/head.dmi'
/obj/item/clothing/shoes/kneesocks
name = "kneesocks"
desc = "A pair of girly knee-high socks."
icon_state = "kneesock"
icon = 'icons/obj/clothing/vg_clothes.dmi'
icon_override = 'icons/mob/citadel/head.dmi'
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/head.dmi'
/obj/item/clothing/shoes/jestershoes
name = "Jester Shoes"
desc = "As worn by the clowns of old."
icon_state = "jestershoes"
icon = 'icons/obj/clothing/vg_clothes.dmi'
icon_override = 'icons/mob/citadel/head.dmi'
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/head.dmi'
/obj/item/clothing/shoes/aviatorboots
name = "Aviator Boots"
desc = "Boots suitable for just about any occasion."
icon_state = "aviator_boots"
icon = 'icons/obj/clothing/vg_clothes.dmi'
icon_override = 'icons/mob/citadel/head.dmi'
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/head.dmi'
/obj/item/clothing/shoes/libertyshoes
name = "Liberty Shoes"
desc = "Freedom isn't free, neither were these shoes."
icon_state = "libertyshoes"
icon = 'icons/obj/clothing/vg_clothes.dmi'
icon_override = 'icons/mob/citadel/head.dmi'
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/head.dmi'
/obj/item/clothing/shoes/megaboots
name = "DRN-001 Boots"
desc = "Large armored boots, very weak to large spikes."
icon_state = "megaboots"
icon = 'icons/obj/clothing/vg_clothes.dmi'
icon_override = 'icons/mob/citadel/head.dmi'
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/head.dmi'
/obj/item/clothing/shoes/protoboots
name = "Prototype Boots"
desc = "Functionally identical to the DRN-001 model's boots, but in red."
icon_state = "protoboots"
icon = 'icons/obj/clothing/vg_clothes.dmi'
icon_override = 'icons/mob/citadel/head.dmi'
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/head.dmi'
/obj/item/clothing/shoes/megaxboots
name = "Maverick Hunter boots"
desc = "Regardless of how much stronger these boots are than the DRN-001 model's, they're still extremely easy to pierce with a large spike."
icon_state = "megaxboots"
icon = 'icons/obj/clothing/vg_clothes.dmi'
icon_override = 'icons/mob/citadel/head.dmi'
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/head.dmi'
/obj/item/clothing/shoes/joeboots
name = "Sniper Boots"
desc = "Nearly identical to the Prototype's boots, except in black."
icon_state = "joeboots"
icon = 'icons/obj/clothing/vg_clothes.dmi'
icon_override = 'icons/mob/citadel/head.dmi'
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/head.dmi'
/obj/item/clothing/shoes/doomguy
name = "Doomguy's boots"
desc = "If you look closely, you might see skull fragments still buried in these boots."
icon_state = "doom"
icon = 'icons/obj/clothing/vg_clothes.dmi'
icon_override = 'icons/mob/citadel/head.dmi'
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/head.dmi'
/obj/item/clothing/shoes/rottenshoes
name = "rotten shoes"
desc = "These shoes seem perfect for sneaking around."
icon_state = "rottenshoes"
icon = 'icons/obj/clothing/vg_clothes.dmi'
icon_override = 'icons/mob/citadel/head.dmi'
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/head.dmi'
/obj/item/clothing/shoes/sandal/slippers
name = "magic slippers"
icon_state = "slippers"
desc = "For the wizard that puts comfort first. Who's going to laugh?"
icon = 'icons/obj/clothing/vg_clothes.dmi'
icon_override = 'icons/mob/citadel/head.dmi'
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/head.dmi'
/obj/item/clothing/shoes/slippers_worn
name = "worn bunny slippers"
desc = "Fluffy..."
icon_state = "slippers_worn"
icon = 'icons/obj/clothing/vg_clothes.dmi'
icon_override = 'icons/mob/citadel/head.dmi'
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/head.dmi'
/obj/item/clothing/shoes/jackboots/neorussian
name = "neo-Russian boots"
desc = "Tovarish, no one will realize you stepped on a pile of shit if your pair already looks like shit."
icon_state = "nr_boots"
icon = 'icons/obj/clothing/vg_clothes.dmi'
icon_override = 'icons/mob/citadel/head.dmi'
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/head.dmi'

28
code/modules/clothing/spacesuits/vg_spess.dm
View File

@@ -7,7 +7,7 @@
icon_state = "hardsuit0-nazi"
armor = list(melee = 40, bullet = 30, laser = 30, energy = 15, bomb = 35, bio = 100, rad = 20)
item_color = "nazi"
icon = 'icons/obj/clothing/vg_clothes.dmi'
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
/obj/item/clothing/suit/space/hardsuit/nazi
name = "nazi hardsuit"
@@ -18,7 +18,7 @@
armor = list(melee = 40, bullet = 30, laser = 30, energy = 15, bomb = 35, bio = 100, rad = 20)
allowed = list(/obj/item/gun,/obj/item/device/flashlight,/obj/item/tank,/obj/item/melee/)
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/nazi
icon = 'icons/obj/clothing/vg_clothes.dmi'
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
/obj/item/clothing/head/helmet/space/hardsuit/soviet
name = "soviet hardhelmet"
@@ -27,7 +27,7 @@
icon_state = "hardsuit0-soviet"
armor = list(melee = 40, bullet = 30, laser = 30, energy = 15, bomb = 35, bio = 100, rad = 20)
item_color = "soviet"
icon = 'icons/obj/clothing/vg_clothes.dmi'
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
/obj/item/clothing/suit/space/hardsuit/soviet
name = "soviet hardsuit"
@@ -38,7 +38,7 @@
armor = list(melee = 40, bullet = 30, laser = 30, energy = 15, bomb = 35, bio = 100, rad = 20)
allowed = list(/obj/item/gun,/obj/item/device/flashlight,/obj/item/tank,/obj/item/melee/)
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/soviet
icon = 'icons/obj/clothing/vg_clothes.dmi'
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
/obj/item/clothing/head/helmet/space/hardsuit/knight
name = "Space-Knight helm"
@@ -48,7 +48,7 @@
armor = list(melee = 60, bullet = 40, laser = 40,energy = 30, bomb = 50, bio = 100, rad = 60)
max_heat_protection_temperature = FIRE_IMMUNITY_HELM_MAX_TEMP_PROTECT
item_color="knight"
icon = 'icons/obj/clothing/vg_clothes.dmi'
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
/obj/item/clothing/suit/space/hardsuit/knight
name = "Space-Knight armour"
@@ -61,7 +61,7 @@
max_heat_protection_temperature = FIRE_IMMUNITY_SUIT_MAX_TEMP_PROTECT
siemens_coefficient = 0.5
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/knight
icon = 'icons/obj/clothing/vg_clothes.dmi'
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
/obj/item/clothing/head/helmet/space/hardsuit/knight/black
name = "Black Knight's helm"
@@ -70,7 +70,7 @@
item_state = "hardsuit0-blackknight"
armor = list(melee = 70, bullet = 65, laser = 50,energy = 25, bomb = 60, bio = 100, rad = 60)
item_color="blackknight"
icon = 'icons/obj/clothing/vg_clothes.dmi'
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
/obj/item/clothing/suit/space/hardsuit/knight/black
name = "Black Knight's armour"
@@ -79,7 +79,7 @@
item_state = "hardsuit-blackknight"
armor = list(melee = 70, bullet = 65, laser = 50,energy = 25, bomb = 60, bio = 100, rad = 60)
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/knight/black
icon = 'icons/obj/clothing/vg_clothes.dmi'
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
/obj/item/clothing/head/helmet/space/hardsuit/knight/solaire
name = "Solar helm"
@@ -88,7 +88,7 @@
item_state = "hardsuit0-solaire"
armor = list(melee = 60, bullet = 65, laser = 90,energy = 30, bomb = 60, bio = 100, rad = 100)
item_color="solaire"
icon = 'icons/obj/clothing/vg_clothes.dmi'
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
/obj/item/clothing/suit/space/hardsuit/knight/solaire
name = "Solar armour"
@@ -97,7 +97,7 @@
item_state = "hardsuit-solaire"
armor = list(melee = 60, bullet = 65, laser = 90,energy = 30, bomb = 60, bio = 100, rad = 100)
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/knight/solaire
icon = 'icons/obj/clothing/vg_clothes.dmi'
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
/obj/item/clothing/head/helmet/space/hardsuit/t51b
name = "T-51b Power Armor"
@@ -106,7 +106,7 @@
item_state = "hardsuit0-t51b"
armor = list(melee = 35, bullet = 35, laser = 40, energy = 40, bomb = 80, bio = 100, rad = 100)
item_color="t51b"
icon = 'icons/obj/clothing/vg_clothes.dmi'
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
/obj/item/clothing/suit/space/hardsuit/t51b
name = "T-51b Power Armor"
@@ -115,7 +115,7 @@
item_state = "hardsuit-t51b"
armor = list(melee = 35, bullet = 35, laser = 40, energy = 40, bomb = 80, bio = 100, rad = 100)
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/t51b
icon = 'icons/obj/clothing/vg_clothes.dmi'
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
/obj/item/clothing/head/helmet/space/bomberman
@@ -125,7 +125,7 @@
item_state = "bomberman"
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 100, bio = 0, rad = 0)
siemens_coefficient = 0
icon = 'icons/obj/clothing/vg_clothes.dmi'
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
obj/item/clothing/suit/space/bomberman
name = "Bomberman's suit"
@@ -136,4 +136,4 @@ obj/item/clothing/suit/space/bomberman
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 100, bio = 0, rad = 0)
siemens_coefficient = 0
max_heat_protection_temperature = FIRE_IMMUNITY_SUIT_MAX_TEMP_PROTECT
icon = 'icons/obj/clothing/vg_clothes.dmi'
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'

52
code/modules/clothing/suits/vg_suits.dm
View File

@@ -7,16 +7,16 @@
body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
armor = list(melee = 50, bullet = 50, laser = 50, energy = 30, bomb = 60, bio = 30, rad = 20)
siemens_coefficient = 0.5
icon = 'icons/obj/clothing/vg_clothes.dmi'
icon_override = 'icons/mob/citadel/suit.dmi'
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/suit.dmi'
/obj/item/clothing/suit/armor/xcomsquaddie/dredd
name = "Judge Armor"
desc = "A large suit of heavy armor, fit for a Judge."
icon_state = "dredd-suit"
item_state = "dredd-suit"
icon = 'icons/obj/clothing/vg_clothes.dmi'
icon_override = 'icons/mob/citadel/suit.dmi'
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/suit.dmi'
/obj/item/clothing/suit/armor/xcomarmor
@@ -28,16 +28,16 @@
armor = list(melee = 50, bullet = 50, laser = 50, energy = 30, bomb = 60, bio = 30, rad = 20)
slowdown = 1
siemens_coefficient = 0.5
icon = 'icons/obj/clothing/vg_clothes.dmi'
icon_override = 'icons/mob/citadel/suit.dmi'
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/suit.dmi'
/obj/item/clothing/suit/armor/vest/neorussian
name = "neo-Russian vest"
desc = "The narkotiki camo pattern will come useful for botany raids."
icon_state = "nr_vest"
item_state = "nr_vest"
icon = 'icons/obj/clothing/vg_clothes.dmi'
icon_override = 'icons/mob/citadel/suit.dmi'
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/suit.dmi'
/obj/item/clothing/suit/armor/doomguy
name = "Doomguy's armor"
@@ -47,8 +47,8 @@
body_parts_covered = CHEST|GROIN
slowdown = 0
armor = list(melee = 50, bullet = 30, laser = 20, energy = 20, bomb = 30, bio = 0, rad = 0)
icon = 'icons/obj/clothing/vg_clothes.dmi'
icon_override = 'icons/mob/citadel/suit.dmi'
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/suit.dmi'
/obj/item/clothing/suit/kaminacape
@@ -56,22 +56,22 @@
desc = "Don't believe in yourself, dumbass. Believe in me. Believe in the Kamina who believes in you."
icon_state = "kaminacape"
body_parts_covered = 0
icon = 'icons/obj/clothing/vg_clothes.dmi'
icon_override = 'icons/mob/citadel/suit.dmi'
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/suit.dmi'
/obj/item/clothing/suit/officercoat
name = "Officer's Coat"
desc = "Ein Mantel gemacht, um die Juden zu bestrafen."
icon_state = "officersuit"
body_parts_covered = CHEST|GROIN|LEGS|ARMS|HANDS
icon = 'icons/obj/clothing/vg_clothes.dmi'
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
/obj/item/clothing/suit/soldiercoat
name = "Soldier's Coat"
desc = "Und das heißt: Erika."
icon_state = "soldiersuit"
body_parts_covered = CHEST|GROIN|LEGS|ARMS|HANDS
icon = 'icons/obj/clothing/vg_clothes.dmi'
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
/obj/item/clothing/suit/russofurcoat
name = "russian fur coat"
@@ -79,46 +79,46 @@
icon_state = "russofurcoat"
allowed = list(/obj/item/gun)
body_parts_covered = CHEST|GROIN|LEGS|ARMS|HANDS
icon = 'icons/obj/clothing/vg_clothes.dmi'
icon_override = 'icons/mob/citadel/suit.dmi'
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/suit.dmi'
/obj/item/clothing/suit/doshjacket
name = "Plasterer's Jacket"
desc = "Perfect for doing up the house."
icon_state = "doshjacket"
body_parts_covered = CHEST|GROIN|ARMS
icon = 'icons/obj/clothing/vg_clothes.dmi'
icon_override = 'icons/mob/citadel/suit.dmi'
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/suit.dmi'
/obj/item/clothing/suit/maidapron
name = "Apron"
desc = "Simple white apron."
icon_state = "maidapron"
body_parts_covered = CHEST|GROIN
icon = 'icons/obj/clothing/vg_clothes.dmi'
icon_override = 'icons/mob/citadel/suit.dmi'
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/suit.dmi'
/obj/item/clothing/suit/clownpiece
name = "small fairy wings"
desc = "Some small and translucid insect-like wings."
icon_state = "clownpiece"
body_parts_covered = 0
icon = 'icons/obj/clothing/vg_clothes.dmi'
icon_override = 'icons/mob/citadel/suit.dmi'
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/suit.dmi'
/obj/item/clothing/suit/clownpiece/flying
name = "small fairy wings"
desc = "Some small and translucid insect-like wings. Looks like these are the real deal!"
icon_state = "clownpiece-fly"
icon = 'icons/obj/clothing/vg_clothes.dmi'
icon_override = 'icons/mob/citadel/suit.dmi'
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/suit.dmi'
/obj/item/clothing/suit/raincoat
name = "Raincoat"
desc = "Do you like Huey Lewis and the News?"
icon_state = "raincoat"
body_parts_covered =CHEST|GROIN|LEGS|ARMS|HANDS
icon = 'icons/obj/clothing/vg_clothes.dmi'
icon_override = 'icons/mob/citadel/suit.dmi'
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/suit.dmi'

152
code/modules/clothing/under/vg_under.dm
View File

@@ -4,8 +4,8 @@
item_state = "stripper_p"
item_color = "stripper_p"
can_adjust = 0
icon = 'icons/obj/clothing/vg_clothes.dmi'
icon_override = 'icons/mob/citadel/uniforms.dmi'
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
/obj/item/clothing/under/stripper_green
@@ -14,8 +14,8 @@
item_state = "stripper_g"
item_color = "stripper_g"
can_adjust = 0
icon = 'icons/obj/clothing/vg_clothes.dmi'
icon_override = 'icons/mob/citadel/uniforms.dmi'
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
@@ -26,8 +26,8 @@
item_state = "bride_orange"
item_color = "bride_orange"
can_adjust = 0
icon = 'icons/obj/clothing/vg_clothes.dmi'
icon_override = 'icons/mob/citadel/uniforms.dmi'
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
/obj/item/clothing/under/wedding/bride_purple
@@ -37,8 +37,8 @@
item_state = "bride_purple"
item_color = "bride_purple"
can_adjust = 0
icon = 'icons/obj/clothing/vg_clothes.dmi'
icon_override = 'icons/mob/citadel/uniforms.dmi'
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
/obj/item/clothing/under/wedding/bride_blue
@@ -48,8 +48,8 @@
item_state = "bride_blue"
item_color = "bride_blue"
can_adjust = 0
icon = 'icons/obj/clothing/vg_clothes.dmi'
icon_override = 'icons/mob/citadel/uniforms.dmi'
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
/obj/item/clothing/under/wedding/bride_red
@@ -59,8 +59,8 @@
item_state = "bride_red"
item_color = "bride_red"
can_adjust = 0
icon = 'icons/obj/clothing/vg_clothes.dmi'
icon_override = 'icons/mob/citadel/uniforms.dmi'
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
/obj/item/clothing/under/wedding/bride_white
@@ -70,8 +70,8 @@
item_state = "bride_white"
item_color = "bride_white"
can_adjust = 0
icon = 'icons/obj/clothing/vg_clothes.dmi'
icon_override = 'icons/mob/citadel/uniforms.dmi'
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
/obj/item/clothing/under/mankini
@@ -80,8 +80,8 @@
item_state = "mankini"
item_color = "mankini"
can_adjust = 0
icon = 'icons/obj/clothing/vg_clothes.dmi'
icon_override = 'icons/mob/citadel/uniforms.dmi'
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
/*
/obj/item/clothing/under/psysuit
@@ -91,8 +91,8 @@
item_state = "psysuit"
item_color = "psysuit"
can_adjust = 0
icon = 'icons/obj/clothing/vg_clothes.dmi'
icon_override = 'icons/mob/citadel/uniforms.dmi'
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
/obj/item/clothing/under/officeruniform
@@ -102,8 +102,8 @@
item_state = "officeruniform"
item_color = "officeruniform"
can_adjust = 0
icon = 'icons/obj/clothing/vg_clothes.dmi'
icon_override = 'icons/mob/citadel/uniforms.dmi'
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
/obj/item/clothing/under/soldieruniform
@@ -113,8 +113,8 @@
item_state = "soldieruniform"
item_color = "soldieruniform"
can_adjust = 0
icon = 'icons/obj/clothing/vg_clothes.dmi'
icon_override = 'icons/mob/citadel/uniforms.dmi'
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
*/
/obj/item/clothing/under/squatter_outfit
@@ -124,8 +124,8 @@
item_state = "squatteroutfit"
item_color = "squatteroutfit"
can_adjust = 0
icon = 'icons/obj/clothing/vg_clothes.dmi'
icon_override = 'icons/mob/citadel/uniforms.dmi'
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
/obj/item/clothing/under/russobluecamooutfit
@@ -135,8 +135,8 @@
item_state = "russobluecamo"
item_color = "russobluecamo"
can_adjust = 0
icon = 'icons/obj/clothing/vg_clothes.dmi'
icon_override = 'icons/mob/citadel/uniforms.dmi'
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
/obj/item/clothing/under/stilsuit
@@ -146,8 +146,8 @@
item_state = "stilsuit"
item_color = "stilsuit"
can_adjust = 0
icon = 'icons/obj/clothing/vg_clothes.dmi'
icon_override = 'icons/mob/citadel/uniforms.dmi'
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
/obj/item/clothing/under/aviatoruniform
@@ -157,8 +157,8 @@
item_state = "aviator_uniform"
item_color = "aviator_uniform"
can_adjust = 0
icon = 'icons/obj/clothing/vg_clothes.dmi'
icon_override = 'icons/mob/citadel/uniforms.dmi'
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
/obj/item/clothing/under/bikersuit
@@ -167,8 +167,8 @@
item_state = "biker"
item_color = "biker"
can_adjust = 0
icon = 'icons/obj/clothing/vg_clothes.dmi'
icon_override = 'icons/mob/citadel/uniforms.dmi'
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
/obj/item/clothing/under/jacketsuit
@@ -178,8 +178,8 @@
item_state = "jacket"
item_color = "jacket"
can_adjust = 0
icon = 'icons/obj/clothing/vg_clothes.dmi'
icon_override = 'icons/mob/citadel/uniforms.dmi'
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
obj/item/clothing/under/mega
@@ -189,8 +189,8 @@ obj/item/clothing/under/mega
item_state = "mega"
item_color = "mega"
can_adjust = 0
icon = 'icons/obj/clothing/vg_clothes.dmi'
icon_override = 'icons/mob/citadel/uniforms.dmi'
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
/obj/item/clothing/under/proto
@@ -200,8 +200,8 @@ obj/item/clothing/under/mega
item_state = "proto"
item_color = "proto"
can_adjust = 0
icon = 'icons/obj/clothing/vg_clothes.dmi'
icon_override = 'icons/mob/citadel/uniforms.dmi'
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
/obj/item/clothing/under/megax
@@ -211,8 +211,8 @@ obj/item/clothing/under/mega
item_state = "megax"
item_color = "megax"
can_adjust = 0
icon = 'icons/obj/clothing/vg_clothes.dmi'
icon_override = 'icons/mob/citadel/uniforms.dmi'
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
/obj/item/clothing/under/joe
@@ -222,8 +222,8 @@ obj/item/clothing/under/mega
item_state = "joe"
item_color = "joe"
can_adjust = 0
icon = 'icons/obj/clothing/vg_clothes.dmi'
icon_override = 'icons/mob/citadel/uniforms.dmi'
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
/obj/item/clothing/under/roll
@@ -233,8 +233,8 @@ obj/item/clothing/under/mega
item_state = "roll"
item_color = "roll"
can_adjust = 0
icon = 'icons/obj/clothing/vg_clothes.dmi'
icon_override = 'icons/mob/citadel/uniforms.dmi'
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
/obj/item/clothing/under/gokugidown
@@ -244,8 +244,8 @@ obj/item/clothing/under/mega
item_state = "gokugidown"
item_color = "gokugidown"
can_adjust = 0
icon = 'icons/obj/clothing/vg_clothes.dmi'
icon_override = 'icons/mob/citadel/uniforms.dmi'
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
/obj/item/clothing/under/gokugi
@@ -255,8 +255,8 @@ obj/item/clothing/under/mega
item_state = "gokugi"
item_color = "gokugi"
can_adjust = 0
icon = 'icons/obj/clothing/vg_clothes.dmi'
icon_override = 'icons/mob/citadel/uniforms.dmi'
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
/obj/item/clothing/under/doomguy
@@ -266,8 +266,8 @@ obj/item/clothing/under/mega
item_state = "doom"
item_color = "doom"
can_adjust = 0
icon = 'icons/obj/clothing/vg_clothes.dmi'
icon_override = 'icons/mob/citadel/uniforms.dmi'
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
/obj/item/clothing/under/vault13
@@ -277,8 +277,8 @@ obj/item/clothing/under/mega
item_state = "v13-jumpsuit"
item_color = "v13-jumpsuit"
can_adjust = 0
icon = 'icons/obj/clothing/vg_clothes.dmi'
icon_override = 'icons/mob/citadel/uniforms.dmi'
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
/obj/item/clothing/under/vault
@@ -288,8 +288,8 @@ obj/item/clothing/under/mega
item_state = "v-jumpsuit"
item_color = "v-jumpsuit"
can_adjust = 0
icon = 'icons/obj/clothing/vg_clothes.dmi'
icon_override = 'icons/mob/citadel/uniforms.dmi'
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
/obj/item/clothing/under/clownpiece
@@ -299,8 +299,8 @@ obj/item/clothing/under/mega
item_state = "clownpiece"
item_color = "clownpiece"
can_adjust = 0
icon = 'icons/obj/clothing/vg_clothes.dmi'
icon_override = 'icons/mob/citadel/uniforms.dmi'
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
/obj/item/clothing/under/cia
@@ -310,8 +310,8 @@ obj/item/clothing/under/mega
item_state = "cia"
item_color = "cia"
can_adjust = 0
icon = 'icons/obj/clothing/vg_clothes.dmi'
icon_override = 'icons/mob/citadel/uniforms.dmi'
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
/obj/item/clothing/under/greaser
@@ -320,8 +320,8 @@ obj/item/clothing/under/mega
icon_state = "greaser_default"
item_state = "greaser_default"
can_adjust = 0
icon = 'icons/obj/clothing/vg_clothes.dmi'
icon_override = 'icons/mob/citadel/uniforms.dmi'
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
/obj/item/clothing/under/greaser/New()
@@ -340,7 +340,7 @@ obj/item/clothing/under/mega
item_state = "greaser_[greaser_colour]"
item_color = "greaser_[greaser_colour]"
can_adjust = 0
icon = 'icons/obj/clothing/vg_clothes.dmi'
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
/obj/item/clothing/under/wintercasualwear
name = "winter casualwear"
@@ -349,8 +349,8 @@ obj/item/clothing/under/mega
item_state = "shizunewinter"
item_color = "shizunewinter"
can_adjust = 0
icon = 'icons/obj/clothing/vg_clothes.dmi'
icon_override = 'icons/mob/citadel/uniforms.dmi'
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
@@ -361,8 +361,8 @@ obj/item/clothing/under/mega
item_state = "shizunenormal"
item_color = "shizunenormal"
can_adjust = 0
icon = 'icons/obj/clothing/vg_clothes.dmi'
icon_override = 'icons/mob/citadel/uniforms.dmi'
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
/obj/item/clothing/under/keyholesweater
@@ -372,8 +372,8 @@ obj/item/clothing/under/mega
item_state = "keyholesweater"
item_color = "keyholesweater"
can_adjust = 0
icon = 'icons/obj/clothing/vg_clothes.dmi'
icon_override = 'icons/mob/citadel/uniforms.dmi'
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
/obj/item/clothing/under/casualhoodie
@@ -383,8 +383,8 @@ obj/item/clothing/under/mega
item_state = "hoodiejeans"
item_color = "hoodiejeans"
can_adjust = 0
icon = 'icons/obj/clothing/vg_clothes.dmi'
icon_override = 'icons/mob/citadel/uniforms.dmi'
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
@@ -393,7 +393,7 @@ obj/item/clothing/under/mega
item_state = "hoodieskirt"
item_color = "hoodieskirt"
can_adjust = 0
icon = 'icons/obj/clothing/vg_clothes.dmi'
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
/*
/obj/item/clothing/under/mummy_rags
name = "mummy rags"
@@ -403,8 +403,8 @@ obj/item/clothing/under/mega
item_color = "mummy"
can_adjust = 0
has_sensor = 0
icon = 'icons/obj/clothing/vg_clothes.dmi'
icon_override = 'icons/mob/citadel/uniforms.dmi'
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
/obj/item/clothing/under/neorussian
@@ -414,8 +414,8 @@ obj/item/clothing/under/mega
item_state = "nr_uniform"
item_color = "nr_uniform"
can_adjust = 0
icon = 'icons/obj/clothing/vg_clothes.dmi'
icon_override = 'icons/mob/citadel/uniforms.dmi'
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
*/
/obj/item/clothing/under/rottensuit
@@ -425,5 +425,5 @@ obj/item/clothing/under/mega
item_state = "rottensuit"
item_color = "rottensuit"
can_adjust = 0
icon = 'icons/obj/clothing/vg_clothes.dmi'
icon_override = 'icons/mob/citadel/uniforms.dmi'
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/uniforms.dmi'

1010
code/modules/mob/dead/new_player/sprite_accessories_Citadel.dm
View File

File diff suppressed because it is too large Load Diff

11
code/modules/mob/living/carbon/emote.dm
View File

@@ -68,17 +68,6 @@
if(!isnum(text2num(params)))
return message
/datum/emote/sound/carbon/snap
key = "snap"
key_third_person = "snaps"
message = "snaps their fingers."
muzzle_ignore = TRUE
restraint_check = TRUE
emote_type = EMOTE_AUDIBLE
sound = 'sound/effects/snap01.ogg'
mob_type_allowed_typecache = list(/mob/living/carbon/)
/datum/emote/living/carbon/sign/signal
key = "signal"
key_third_person = "signals"

280
code/modules/mob/living/carbon/human/species_types/furrypeople.dm
View File

@@ -1,280 +0,0 @@
/datum/species/mammal
name = "Mammal"
id = "mammal"
default_color = "4B4B4B"
species_traits = list(MUTCOLORS,EYECOLOR,LIPS,HAIR,SPECIES_ORGANIC)
mutant_bodyparts = list("mam_tail", "mam_ears", "mam_body_markings", "snout", "taur")
default_features = list("mcolor" = "FFF","mcolor2" = "FFF","mcolor3" = "FFF", "body_markings" = "None", "mam_tail" = "None", "mam_ears" = "None", "mam_body_markings" = "None", "taur" = "None")
attack_verb = "claw"
attack_sound = 'sound/weapons/slash.ogg'
miss_sound = 'sound/weapons/slashmiss.ogg'
liked_food = MEAT | FRIED
disliked_food = TOXIC
/datum/species/mammal/spec_death(gibbed, mob/living/carbon/human/H)
if(H)
H.endTailWag()
/datum/species/mammal/qualifies_for_rank(rank, list/features)
return TRUE
//AVIAN//
/datum/species/avian
name = "Avian"
id = "avian"
say_mod = "chirps"
default_color = "BCAC9B"
species_traits = list(MUTCOLORS,EYECOLOR,LIPS,HAIR,SPECIES_ORGANIC)
mutant_bodyparts = list("snout", "wings", "taur", "mam_tail", "mam_body_markings", "taur")
default_features = list("snout" = "Sharp", "wings" = "None", "taur" = "None", "mam_body_markings" = "Hawk")
attack_verb = "peck"
attack_sound = 'sound/weapons/slash.ogg'
miss_sound = 'sound/weapons/slashmiss.ogg'
liked_food = MEAT | FRUIT
disliked_food = TOXIC
/datum/species/avian/spec_death(gibbed, mob/living/carbon/human/H)
if(H)
H.endTailWag()
/datum/species/avian/qualifies_for_rank(rank, list/features)
return TRUE
//AQUATIC//
/datum/species/aquatic
name = "Aquatic"
id = "aquatic"
default_color = "BCAC9B"
species_traits = list(MUTCOLORS,EYECOLOR,LIPS,HAIR,SPECIES_ORGANIC)
mutant_bodyparts = list("mam_tail", "mam_body_markings", "mam_ears", "taur")
default_features = list("mcolor" = "FFF","mcolor2" = "FFF","mcolor3" = "FFF","mam_tail" = "shark", "mam_body_markings" = "None", "mam_ears" = "None")
attack_verb = "bite"
attack_sound = 'sound/weapons/bite.ogg'
miss_sound = 'sound/weapons/slashmiss.ogg'
liked_food = MEAT
disliked_food = TOXIC
meat = /obj/item/reagent_containers/food/snacks/carpmeat/aquatic
/datum/species/aquatic/spec_death(gibbed, mob/living/carbon/human/H)
if(H)
H.endTailWag()
/datum/species/aquatic/qualifies_for_rank(rank, list/features)
return TRUE
//INSECT//
/datum/species/insect
name = "Insect"
id = "insect"
default_color = "BCAC9B"
species_traits = list(MUTCOLORS,EYECOLOR,LIPS,HAIR,SPECIES_ORGANIC)
mutant_bodyparts = list("mam_body_markings", "mam_ears", "mam_tail", "taur", "moth_wings")
default_features = list("mcolor" = "FFF","mcolor2" = "FFF","mcolor3" = "FFF", "mam_body_markings" = "moth", "mam_tail" = "None", "mam_ears" = "None", "moth_wings" = "None")
attack_verb = "flutter" //wat?
attack_sound = 'sound/weapons/slash.ogg'
miss_sound = 'sound/weapons/slashmiss.ogg'
liked_food = MEAT | FRUIT
disliked_food = TOXIC
/datum/species/insect/spec_death(gibbed, mob/living/carbon/human/H)
if(H)
H.endTailWag()
/datum/species/insect/qualifies_for_rank(rank, list/features)
return TRUE
//Alien//
/datum/species/xeno
// A cloning mistake, crossing human and xenomorph DNA
name = "xeno"
id = "xeno"
say_mod = "hisses"
default_color = "00FF00"
species_traits = list(MUTCOLORS,EYECOLOR,LIPS,SPECIES_ORGANIC)
mutant_bodyparts = list("xenotail", "xenohead", "xenodorsal", "legs", "taur","mam_body_markings")
default_features = list("xenotail"="xeno","xenohead"="standard","xenodorsal"="standard","mcolor" = "0F0","mcolor2" = "0F0","mcolor3" = "0F0","taur" = "None","mam_body_markings" = "xeno")
attack_verb = "slash"
attack_sound = 'sound/weapons/slash.ogg'
miss_sound = 'sound/weapons/slashmiss.ogg'
meat = /obj/item/reagent_containers/food/snacks/meat/slab/xeno
skinned_type = /obj/item/stack/sheet/animalhide/xeno
exotic_bloodtype = "L"
damage_overlay_type = "xeno"
liked_food = MEAT
//Praise the Omnissiah, A challange worthy of my skills - HS
//EXOTIC//
//These races will likely include lots of downsides and upsides. Keep them relatively balanced.//
/*
/datum/species/xeno
name = "Xenomorph"
id = "xeno"
say_mod = "hisses"
eyes = "none"
species_traits = list()
mutant_organs = list(/obj/item/organ/tongue/alien)
mutant_bodyparts = list("xenohead",
"xenodorsal",
"xenotail")
default_features = list("xenohead"="Hunter",
"xenodorsal"="Dorsal Tubes",
"xenotail"="Xenomorph Tail")
attack_verb = "slash"
attack_sound = 'sound/weapons/slash.ogg'
miss_sound = 'sound/weapons/slashmiss.ogg'
burnmod = 1.75
heatmod = 1.75
darksight = 4 //Just above slimes
exotic_blood = "xblood"
damage_overlay_type = "xeno"
no_equip = list(slot_glasses) //MY EYES, THEY'RE GONE
meat = /obj/item/reagent_containers/food/snacks/meat/slab/xeno
skinned_type = /obj/item/stack/sheet/animalhide/xeno
// safe_toxins_max = 32 //Too much of anything is bad.
// whitelisted = 1
// whitelist = list("talkingcactus") //testing whitelisting
/datum/species/xeno/on_species_gain(mob/living/carbon/C, datum/species/old_species)
..()
var/obj/effect/decal/cleanable/xenoblood/xgibs/XG
if(istype(C.gib_type, XG))
return
else
C.gib_type = XG
/datum/species/xeno/on_species_loss(mob/living/carbon/C)
..()
var/obj/effect/decal/cleanable/xenoblood/xgibs/XG
var/obj/effect/decal/cleanable/blood/gibs/HG
if(istype(C.gib_type, XG))
C.gib_type = HG
else
return
/datum/reagent/toxin/acid/xenoblood
name = "acid blood"
id = "xblood"
description = "A highly corrosive substance, it is capable of burning through most natural or man-made materials in short order."
color = "#66CC00"
toxpwr = 0
acidpwr = 12 */
//##########SLIMEPEOPLE##########
/datum/species/jelly/roundstartslime
name = "Slimeperson"
id = "slimeperson"
default_color = "00FFFF"
species_traits = list(SPECIES_ORGANIC,MUTCOLORS,EYECOLOR,HAIR,FACEHAIR,NOBLOOD)
inherent_traits = list(TRAIT_TOXINLOVER)
mutant_bodyparts = list("mam_tail", "mam_ears", "taur")
default_features = list("mcolor" = "FFF", "mam_tail" = "None", "mam_ears" = "None")
say_mod = "says"
hair_color = "mutcolor"
hair_alpha = 180
liked_food = MEAT
coldmod = 3
heatmod = 1
burnmod = 1
/datum/action/innate/slime_change
name = "Alter Form"
check_flags = AB_CHECK_CONSCIOUS
button_icon_state = "alter_form" //placeholder
icon_icon = 'icons/mob/actions/actions_slime.dmi'
background_icon_state = "bg_alien"
/datum/action/innate/slime_change/Activate()
var/mob/living/carbon/human/H = owner
if(!isjellyperson(H))
return
else
H.visible_message("<span class='notice'>[owner] gains a look of \
concentration while standing perfectly still.\
Their body seems to shift and starts getting more goo-like.</span>",
"<span class='notice'>You focus intently on altering your body while \
standing perfectly still...</span>")
change_form()
/datum/action/innate/slime_change/proc/change_form()
var/mob/living/carbon/human/H = owner
var/select_alteration = input(owner, "Select what part of your form to alter", "Form Alteration", "cancel") in list("Hair Style", "Genitals", "Tail", "Ears", "Taur body", "Cancel")
if(select_alteration == "Hair Style")
if(H.gender == MALE)
var/new_style = input(owner, "Select a facial hair style", "Hair Alterations") as null|anything in GLOB.facial_hair_styles_list
if(new_style)
H.facial_hair_style = new_style
else
H.facial_hair_style = "Shaved"
//handle normal hair
var/new_style = input(owner, "Select a hair style", "Hair Alterations") as null|anything in GLOB.hair_styles_list
if(new_style)
H.hair_style = new_style
H.update_hair()
else if (select_alteration == "Genitals")
var/list/organs = list()
var/operation = input("Select organ operation.", "Organ Manipulation", "cancel") in list("add sexual organ", "remove sexual organ", "cancel")
switch(operation)
if("add sexual organ")
var/new_organ = input("Select sexual organ:", "Organ Manipulation") in list("Penis", "Testicles", "Breasts", "Vagina", "Womb", "Cancel")
if(new_organ == "Penis")
H.give_penis()
else if(new_organ == "Testicles")
H.give_balls()
else if(new_organ == "Breasts")
H.give_breasts()
else if(new_organ == "Vagina")
H.give_vagina()
else if(new_organ == "Womb")
H.give_womb()
else
return
if("remove sexual organ")
for(var/obj/item/organ/genital/X in H.internal_organs)
var/obj/item/organ/I = X
organs["[I.name] ([I.type])"] = I
var/obj/item/organ = input("Select sexual organ:", "Organ Manipulation", null) in organs
organ = organs[organ]
if(!organ)
return
var/obj/item/organ/genital/O
if(isorgan(organ))
O = organ
O.Remove(H)
organ.forceMove(get_turf(H))
qdel(organ)
H.update_body()
else if (select_alteration == "Ears")
var/new_ears
new_ears = input(owner, "Choose your character's ears:", "Ear Alteration") as null|anything in GLOB.mam_ears_list
if(new_ears)
H.dna.features["mam_ears"] = new_ears
H.update_body()
else if (select_alteration == "Tail")
var/new_tail
new_tail = input(owner, "Choose your character's tail:", "Tail Alteration") as null|anything in GLOB.mam_tails_list
if(new_tail)
H.dna.features["mam_tail"] = new_tail
if(new_tail != "None")
H.dna.features["taur"] = "None"
H.update_body()
else if (select_alteration == "Taur body")
var/new_taur
new_taur = input(owner, "Choose your character's tauric body:", "Taur Body Alteration") as null|anything in GLOB.taur_list
if(new_taur)
H.dna.features["taur"] = new_taur
if(new_taur != "None")
H.dna.features["mam_tail"] = "None"
H.dna.features["xenotail"] = "None"
H.update_body()
else
return
//misc
/mob/living/carbon/human/dummy
no_vore = TRUE
/mob/living/carbon/human/vore
devourable = TRUE

4
code/modules/projectiles/guns/energy/megabuster.dm
View File

@@ -9,7 +9,7 @@
item_flags = NEEDS_PERMIT
selfcharge = TRUE
cell_type = "/obj/item/stock_parts/cell/pulse"
icon = 'icons/obj/guns/VGguns.dmi'
icon = 'modular_citadel/icons/obj/guns/VGguns.dmi'
/obj/item/gun/energy/megabuster/proto
name = "Proto-buster"
@@ -19,7 +19,7 @@
/obj/item/gun/energy/mmlbuster
name = "Buster Cannon"
desc = "An antique arm-mounted buster cannon."
icon = 'icons/obj/guns/VGguns.dmi'
icon = 'modular_citadel/icons/obj/guns/VGguns.dmi'
icon_state = "mmlbuster"
item_state = "mmlbuster"
w_class = WEIGHT_CLASS_SMALL

22
code/modules/projectiles/guns/energy/plasma_cit.dm
View File

@@ -7,8 +7,8 @@
cell_type = "/obj/item/stock_parts/cell/pulse/carbine"
ammo_x_offset = 2
shaded_charge = 1
lefthand_file = 'icons/mob/citadel/guns_lefthand.dmi'
righthand_file = 'icons/mob/citadel/guns_righthand.dmi'
lefthand_file = 'modular_citadel/icons/mob/citadel/guns_lefthand.dmi'
righthand_file = 'modular_citadel/icons/mob/citadel/guns_righthand.dmi'
/obj/item/gun/energy/plasma/rifle
@@ -16,7 +16,7 @@
desc = "A state of the art cannon utilizing plasma in a uranium-235 lined core to output hi-power, radiating bolts of energy."
icon_state = "alienrifle"
item_state = null
icon = 'icons/obj/guns/VGguns.dmi'
icon = 'modular_citadel/icons/obj/guns/VGguns.dmi'
w_class = WEIGHT_CLASS_BULKY
ammo_type = list(/obj/item/ammo_casing/energy/plasmagun/rifle)
ammo_x_offset = 4
@@ -28,7 +28,7 @@
desc = "A state of the art rifle utilizing plasma in a uranium-235 lined core to output radiating bolts of energy."
icon_state = "lightalienrifle"
item_state = null
icon = 'icons/obj/guns/VGguns.dmi'
icon = 'modular_citadel/icons/obj/guns/VGguns.dmi'
ammo_type = list(/obj/item/ammo_casing/energy/plasmagun/light)
ammo_x_offset = 2
@@ -38,7 +38,7 @@
desc = "A plasma MP40k. Ich liebe den geruch von plasma am morgen."
icon_state = "PlasMP"
item_state = null
icon = 'icons/obj/guns/VGguns.dmi'
icon = 'modular_citadel/icons/obj/guns/VGguns.dmi'
ammo_type = list(/obj/item/ammo_casing/energy/plasmagun/MP40k)
ammo_x_offset = 3
@@ -49,21 +49,21 @@
desc = "A laser rifle issued to high ranking members of a certain shadow corporation."
icon_state = "xcomlasergun"
item_state = null
icon = 'icons/obj/guns/VGguns.dmi'
icon = 'modular_citadel/icons/obj/guns/VGguns.dmi'
cell_type = "/obj/item/stock_parts/cell/pulse/carbine"
ammo_type = list(/obj/item/ammo_casing/energy/lasergun)
ammo_x_offset = 4
lefthand_file = 'icons/mob/citadel/guns_lefthand.dmi'
righthand_file = 'icons/mob/citadel/guns_righthand.dmi'
lefthand_file = 'modular_citadel/icons/mob/citadel/guns_lefthand.dmi'
righthand_file = 'modular_citadel/icons/mob/citadel/guns_righthand.dmi'
/obj/item/gun/energy/laser/LaserAK
name = "Laser AK470"
desc = "A laser AK. Death solves all problems -- No man, no problem."
icon_state = "LaserAK"
item_state = null
icon = 'icons/obj/guns/VGguns.dmi'
icon = 'modular_citadel/icons/obj/guns/VGguns.dmi'
cell_type = "/obj/item/stock_parts/cell/pulse/carbine"
ammo_type = list(/obj/item/ammo_casing/energy/laser)
ammo_x_offset = 4
lefthand_file = 'icons/mob/citadel/guns_lefthand.dmi'
righthand_file = 'icons/mob/citadel/guns_righthand.dmi'
lefthand_file = 'modular_citadel/icons/mob/citadel/guns_lefthand.dmi'
righthand_file = 'modular_citadel/icons/mob/citadel/guns_righthand.dmi'

12
code/modules/projectiles/projectile/megabuster.dm
View File

@@ -6,14 +6,14 @@
damage_type = BURN
hitsound = 'sound/weapons/sear.ogg'
hitsound_wall = 'sound/weapons/effects/searwall.ogg'
icon = 'icons/obj/VGprojectile.dmi'
lefthand_file = 'icons/mob/citadel/guns_lefthand.dmi'
righthand_file = 'icons/mob/citadel/guns_righthand.dmi'
icon = 'modular_citadel/icons/obj/VGprojectile.dmi'
lefthand_file = 'modular_citadel/icons/mob/citadel/guns_lefthand.dmi'
righthand_file = 'modular_citadel/icons/mob/citadel/guns_righthand.dmi'
/obj/item/projectile/energy/megabuster
name = "buster pellet"
icon_state = "megabuster"
nodamage = 1
icon = 'icons/obj/VGprojectile.dmi'
lefthand_file = 'icons/mob/citadel/guns_lefthand.dmi'
righthand_file = 'icons/mob/citadel/guns_righthand.dmi'
icon = 'modular_citadel/icons/obj/VGprojectile.dmi'
lefthand_file = 'modular_citadel/icons/mob/citadel/guns_lefthand.dmi'
righthand_file = 'modular_citadel/icons/mob/citadel/guns_righthand.dmi'

2
code/modules/projectiles/projectile/plasma.dm
View File

@@ -1,5 +1,5 @@
obj/item/projectile/energy/plasmabolt
icon = 'icons/obj/VGProjectile.dmi'
icon = 'modular_citadel/icons/obj/VGProjectile.dmi'
name = "plasma bolt"
icon_state = "plasma"
flag = "energy"

8
code/modules/surgery/bodyparts/bodyparts.dm
View File

@@ -334,6 +334,14 @@
limb.icon_state = "[species_id]_[body_zone]_[icon_gender]"
else
limb.icon_state = "[species_id]_[body_zone]"
// Citadel Start
if(should_draw_citadel)
limb.icon = 'modular_citadel/icons/mob/mutant_bodyparts.dmi'
if(should_draw_gender)
limb.icon_state = "[species_id]_[body_zone]_[icon_gender]"
else
limb.icon_state = "[species_id]_[body_zone]"
// Citadel End
if(aux_zone)
aux = image(limb.icon, "[species_id]_[aux_zone]", -aux_layer, image_dir)
. += aux