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

2
code/__HELPERS/_cit_helpers.dm
View File

@@ -50,6 +50,8 @@ GLOBAL_LIST_EMPTY(xeno_head_list)
GLOBAL_LIST_EMPTY(xeno_tail_list)
GLOBAL_LIST_EMPTY(xeno_dorsal_list)
//IPC species
GLOBAL_LIST_EMPTY(ipc_screens_list)
//Genitals and Arousal Lists
GLOBAL_LIST_EMPTY(cock_shapes_list)//global_lists.dm for the list initializations //Now also _DATASTRUCTURES globals.dm

15
code/__HELPERS/mobs.dm
View File

@@ -81,6 +81,8 @@
init_sprite_accessory_subtypes(/datum/sprite_accessory/vagina, GLOB.vagina_shapes_list)
if(!GLOB.breasts_shapes_list.len)
init_sprite_accessory_subtypes(/datum/sprite_accessory/breasts, GLOB.breasts_shapes_list)
if(!GLOB.ipc_screens_list.len)
init_sprite_accessory_subtypes(/datum/sprite_accessory/screen, GLOB.ipc_screens_list)
// if(ishuman(src))
// var/mob/living/carbon/human/H = src
/* if(H.gender == MALE) Fuck if I know how to fix this.
@@ -114,13 +116,13 @@
"caps" = pick(GLOB.caps_list),
"moth_wings" = pick(GLOB.moth_wings_list),
"taur" = "None",
"mam_body_markings" = "None",
"mam_ears" = "None",
"mam_tail" = "None",
"mam_body_markings" = "wolf",
"mam_ears" = "wolf",
"mam_tail" = "wolf",
"mam_tail_animated" = "None",
"xenodorsal" = "None",
"xenohead" = "None",
"xenotail" = "None",
"xenodorsal" = "standard",
"xenohead" = "standard",
"xenotail" = "standard",
"exhibitionist" = FALSE,
"genitals_use_skintone" = FALSE,
"has_cock" = FALSE,
@@ -166,6 +168,7 @@
"womb_cum_mult" = CUM_RATE_MULT,
"womb_efficiency" = CUM_EFFICIENCY,
"womb_fluid" = "femcum",
"ipc_screen" = "Sunburst",
"flavor_text" = ""))
/proc/random_hair_style(gender)

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'

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"

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

BIN
icons/mob/human_parts_greyscale.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 63 KiB

After

Width:  |  Height:  |  Size: 41 KiB

BIN
icons/obj/clothing/turtlenecks.dmi
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1009 B

26
modular_citadel/code/game/objects/items/meat.dm Normal file
View File

@@ -0,0 +1,26 @@
/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/ipc
icon = 'modular_citadel/icons/obj/foods.dmi'
icon_state = "ipcmeat"
desc = "Gross robot meat."
filling_color = "#000000"
tastes = list("metal" = 1)
/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/moth
icon = 'modular_citadel/icons/obj/foods.dmi'
icon_state = "mothmeat"
desc = "Moth meat."
filling_color = "#BF896B"
tastes = list("insects" = 1)
/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/avian
icon = 'modular_citadel/icons/obj/foods.dmi'
icon_state = "birdmeat"
desc = "Quality bird meat."
filling_color = "#BF896B"
tastes = list("chicken" = 1)
/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/mammal
desc = "Furry meat. WHO DID THIS?!"
filling_color = "#6B8E23"
tastes = list("brains" = 1, "meat" = 1)

1
modular_citadel/code/init.dm
View File

@@ -17,6 +17,7 @@
init_sprite_accessory_subtypes(/datum/sprite_accessory/xeno_head, GLOB.xeno_head_list)
init_sprite_accessory_subtypes(/datum/sprite_accessory/xeno_tail, GLOB.xeno_tail_list)
init_sprite_accessory_subtypes(/datum/sprite_accessory/xeno_dorsal, GLOB.xeno_dorsal_list)
init_sprite_accessory_subtypes(/datum/sprite_accessory/screen, GLOB.ipc_screens_list, roundstart = TRUE)
init_sprite_accessory_subtypes(/datum/sprite_accessory/penis, GLOB.cock_shapes_list)
for(var/K in GLOB.cock_shapes_list)
var/datum/sprite_accessory/penis/value = GLOB.cock_shapes_list[K]

737
modular_citadel/code/modules/client/preferences.dm
View File

@@ -12,11 +12,740 @@
var/arousable = TRUE
var/widescreenpref = TRUE
var/autostand = TRUE
max_save_slots = 10
features = list("mcolor" = "FFF",
"tail_lizard" = "Smooth",
"tail_human" = "None",
"snout" = "Round",
"horns" = "None",
"ears" = "None",
"wings" = "None",
"frills" = "None",
"spines" = "None",
"body_markings" = "None",
"legs" = "Normal Legs",
"moth_wings" = "Plain",
"mcolor2" = "FFF",
"mcolor3" = "FFF",
"mam_body_markings" = "None",
"mam_ears" = "None",
"mam_tail" = "None",
"mam_tail_animated" = "None",
"xenodorsal" = "None",
"xenohead" = "None",
"xenotail" = "None",
"taur" = "None",
"exhibitionist" = FALSE,
"genitals_use_skintone" = FALSE,
"has_cock" = FALSE,
"cock_shape" = "Human",
"cock_length" = 6,
"cock_girth_ratio" = COCK_GIRTH_RATIO_DEF,
"cock_color" = "fff",
"has_sheath" = FALSE,
"sheath_color" = "fff",
"has_balls" = FALSE,
"balls_internal" = FALSE,
"balls_color" = "fff",
"balls_amount" = 2,
"balls_sack_size" = BALLS_SACK_SIZE_DEF,
"balls_size" = BALLS_SIZE_DEF,
"balls_cum_rate" = CUM_RATE,
"balls_cum_mult" = CUM_RATE_MULT,
"balls_efficiency" = CUM_EFFICIENCY,
"balls_fluid" = "semen",
"has_ovi" = FALSE,
"ovi_shape" = "knotted",
"ovi_length" = 6,
"ovi_color" = "fff",
"has_eggsack" = FALSE,
"eggsack_internal" = TRUE,
"eggsack_color" = "fff",
"eggsack_size" = BALLS_SACK_SIZE_DEF,
"eggsack_egg_color" = "fff",
"eggsack_egg_size" = EGG_GIRTH_DEF,
"has_breasts" = FALSE,
"breasts_color" = "fff",
"breasts_size" = "C",
"breasts_shape" = "Pair",
"breasts_fluid" = "milk",
"has_vag" = FALSE,
"vag_shape" = "Human",
"vag_color" = "fff",
"vag_clits" = 1,
"vag_clit_diam" = 0.25,
"has_womb" = FALSE,
"womb_cum_rate" = CUM_RATE,
"womb_cum_mult" = CUM_RATE_MULT,
"womb_efficiency" = CUM_EFFICIENCY,
"womb_fluid" = "femcum",
"ipc_screen" = "Sunburst",
"flavor_text" = "")
/datum/preferences/New(client/C)
..()
LAZYINITLIST(chosen_gear)
/datum/preferences/proc/add_citadel_choices(dat)
if(current_tab == 2)
update_preview_icon(nude=TRUE)
else
update_preview_icon(nude=FALSE)
return dat
/datum/preferences/proc/process_citadel_link(mob/user, list/href_list)
if(href_list["task"] == "input")
switch(href_list["preference"])
if("flavor_text")
var/msg = stripped_multiline_input(usr,"Set the flavor text in your 'examine' verb. This can also be used for OOC notes and preferences!","Flavor Text",html_decode(features["flavor_text"]), MAX_MESSAGE_LEN*2, TRUE) as message
if(msg != null)
msg = copytext(msg, 1, MAX_MESSAGE_LEN*2)
features["flavor_text"] = msg
if("species")
var/result = input(user, "Select a species", "Species Selection") as null|anything in GLOB.roundstart_races
if(result)
var/newtype = GLOB.species_list[result]
pref_species = new newtype()
//Now that we changed our species, we must verify that the mutant colour is still allowed.
var/temp_hsv = RGBtoHSV(features["mcolor"])
if(features["mcolor"] == "#000" || (!(MUTCOLORS_PARTSONLY in pref_species.species_traits) && ReadHSV(temp_hsv)[3] < ReadHSV("#202020")[3]))
features["mcolor"] = pref_species.default_color
if(features["mcolor2"] == "#000" || (!(MUTCOLORS_PARTSONLY in pref_species.species_traits) && ReadHSV(temp_hsv)[3] < ReadHSV("#202020")[3]))
features["mcolor2"] = pref_species.default_color
if(features["mcolor3"] == "#000" || (!(MUTCOLORS_PARTSONLY in pref_species.species_traits) && ReadHSV(temp_hsv)[3] < ReadHSV("#202020")[3]))
features["mcolor3"] = pref_species.default_color
if("mutant_color")
var/new_mutantcolor = input(user, "Choose your character's alien/mutant color:", "Character Preference","#"+features["mcolor"]) as color|null
if(new_mutantcolor)
var/temp_hsv = RGBtoHSV(new_mutantcolor)
if(new_mutantcolor == "#000000")
features["mcolor"] = pref_species.default_color
else if((MUTCOLORS_PARTSONLY in pref_species.species_traits) || ReadHSV(temp_hsv)[3] >= ReadHSV("#202020")[3]) // mutantcolors must be bright, but only if they affect the skin
features["mcolor"] = sanitize_hexcolor(new_mutantcolor)
else
to_chat(user, "<span class='danger'>Invalid color. Your color is not bright enough.</span>")
if("mutant_color2")
var/new_mutantcolor = input(user, "Choose your character's secondary alien/mutant color:", "Character Preference") as color|null
if(new_mutantcolor)
var/temp_hsv = RGBtoHSV(new_mutantcolor)
if(new_mutantcolor == "#000000")
features["mcolor2"] = pref_species.default_color
else if((MUTCOLORS_PARTSONLY in pref_species.species_traits) || ReadHSV(temp_hsv)[3] >= ReadHSV("#202020")[3]) // mutantcolors must be bright, but only if they affect the skin
features["mcolor2"] = sanitize_hexcolor(new_mutantcolor)
else
to_chat(user, "<span class='danger'>Invalid color. Your color is not bright enough.</span>")
if("mutant_color3")
var/new_mutantcolor = input(user, "Choose your character's tertiary alien/mutant color:", "Character Preference") as color|null
if(new_mutantcolor)
var/temp_hsv = RGBtoHSV(new_mutantcolor)
if(new_mutantcolor == "#000000")
features["mcolor3"] = pref_species.default_color
else if((MUTCOLORS_PARTSONLY in pref_species.species_traits) || ReadHSV(temp_hsv)[3] >= ReadHSV("#202020")[3]) // mutantcolors must be bright, but only if they affect the skin
features["mcolor3"] = sanitize_hexcolor(new_mutantcolor)
else
to_chat(user, "<span class='danger'>Invalid color. Your color is not bright enough.</span>")
if("ipc_screen")
var/new_ipc_screen
new_ipc_screen = input(user, "Choose your character's screen:", "Character Preference") as null|anything in GLOB.ipc_screens_list
if(new_ipc_screen)
features["ipc_screen"] = new_ipc_screen
if("tail_lizard")
var/new_tail
new_tail = input(user, "Choose your character's tail:", "Character Preference") as null|anything in GLOB.tails_list_lizard
if(new_tail)
features["tail_lizard"] = new_tail
if(new_tail != "None")
features["taur"] = "None"
if("tail_human")
var/list/snowflake_tails_list = list("Normal" = null)
for(var/path in GLOB.tails_list_human)
var/datum/sprite_accessory/tails/human/instance = GLOB.tails_list_human[path]
if(istype(instance, /datum/sprite_accessory))
var/datum/sprite_accessory/S = instance
if((!S.ckeys_allowed) || (S.ckeys_allowed.Find(user.client.ckey)))
snowflake_tails_list[S.name] = path
var/new_tail
new_tail = input(user, "Choose your character's tail:", "Character Preference") as null|anything in snowflake_tails_list
if(new_tail)
features["tail_human"] = new_tail
if(new_tail != "None")
features["taur"] = "None"
if("mam_tail")
var/list/snowflake_tails_list = list("Normal" = null)
for(var/path in GLOB.mam_tails_list)
var/datum/sprite_accessory/mam_tails/instance = GLOB.mam_tails_list[path]
if(istype(instance, /datum/sprite_accessory))
var/datum/sprite_accessory/S = instance
if((!S.ckeys_allowed) || (S.ckeys_allowed.Find(user.client.ckey)))
snowflake_tails_list[S.name] = path
var/new_tail
new_tail = input(user, "Choose your character's tail:", "Character Preference") as null|anything in snowflake_tails_list
if(new_tail)
features["mam_tail"] = new_tail
if(new_tail != "None")
features["taur"] = "None"
if("taur")
var/list/snowflake_taur_list = list("Normal" = null)
for(var/path in GLOB.taur_list)
var/datum/sprite_accessory/taur/instance = GLOB.taur_list[path]
if(istype(instance, /datum/sprite_accessory))
var/datum/sprite_accessory/S = instance
if((!S.ckeys_allowed) || (S.ckeys_allowed.Find(user.client.ckey)))
snowflake_taur_list[S.name] = path
var/new_taur
new_taur = input(user, "Choose your character's tauric body:", "Character Preference") as null|anything in snowflake_taur_list
if(new_taur)
features["taur"] = new_taur
if(new_taur != "None")
features["mam_tail"] = "None"
features["xenotail"] = "None"
if("ears")
var/list/snowflake_ears_list = list("Normal" = null)
for(var/path in GLOB.ears_list)
var/datum/sprite_accessory/ears/instance = GLOB.ears_list[path]
if(istype(instance, /datum/sprite_accessory))
var/datum/sprite_accessory/S = instance
if((!S.ckeys_allowed) || (S.ckeys_allowed.Find(user.client.ckey)))
snowflake_ears_list[S.name] = path
var/new_ears
new_ears = input(user, "Choose your character's ears:", "Character Preference") as null|anything in snowflake_ears_list
if(new_ears)
features["ears"] = new_ears
if("mam_ears")
var/list/snowflake_ears_list = list("Normal" = null)
for(var/path in GLOB.mam_ears_list)
var/datum/sprite_accessory/mam_ears/instance = GLOB.mam_ears_list[path]
if(istype(instance, /datum/sprite_accessory))
var/datum/sprite_accessory/S = instance
if((!S.ckeys_allowed) || (S.ckeys_allowed.Find(user.client.ckey)))
snowflake_ears_list[S.name] = path
var/new_ears
new_ears = input(user, "Choose your character's ears:", "Character Preference") as null|anything in snowflake_ears_list
if(new_ears)
features["mam_ears"] = new_ears
if("mam_body_markings")
var/list/snowflake_markings_list = list("Normal" = null)
for(var/path in GLOB.mam_body_markings_list)
var/datum/sprite_accessory/mam_body_markings/instance = GLOB.mam_body_markings_list[path]
if(istype(instance, /datum/sprite_accessory))
var/datum/sprite_accessory/S = instance
if((!S.ckeys_allowed) || (S.ckeys_allowed.Find(user.client.ckey)))
snowflake_markings_list[S.name] = path
var/new_mam_body_markings
new_mam_body_markings = input(user, "Choose your character's body markings:", "Character Preference") as null|anything in snowflake_markings_list
if(new_mam_body_markings)
features["mam_body_markings"] = new_mam_body_markings
//Xeno Bodyparts
if("xenohead")//Head or caste type
var/new_head
new_head = input(user, "Choose your character's caste:", "Character Preference") as null|anything in GLOB.xeno_head_list
if(new_head)
features["xenohead"] = new_head
if("xenotail")//Currently one one type, more maybe later if someone sprites them. Might include animated variants in the future.
var/new_tail
new_tail = input(user, "Choose your character's tail:", "Character Preference") as null|anything in GLOB.xeno_tail_list
if(new_tail)
features["xenotail"] = new_tail
if("xenodorsal")
var/new_dors
new_dors = input(user, "Choose your character's dorsal tube type:", "Character Preference") as null|anything in GLOB.xeno_dorsal_list
if(new_dors)
features["xenodorsal"] = new_dors
//Genital code
if("cock_color")
var/new_cockcolor = input(user, "Penis color:", "Character Preference") as color|null
if(new_cockcolor)
var/temp_hsv = RGBtoHSV(new_cockcolor)
if(new_cockcolor == "#000000")
features["cock_color"] = pref_species.default_color
else if((MUTCOLORS_PARTSONLY in pref_species.species_traits) || ReadHSV(temp_hsv)[3] >= ReadHSV("#202020")[3])
features["cock_color"] = sanitize_hexcolor(new_cockcolor)
else
user << "<span class='danger'>Invalid color. Your color is not bright enough.</span>"
if("cock_length")
var/new_length = input(user, "Penis length in inches:\n([COCK_SIZE_MIN]-[COCK_SIZE_MAX])", "Character Preference") as num|null
if(new_length)
features["cock_length"] = max(min( round(text2num(new_length)), COCK_SIZE_MAX),COCK_SIZE_MIN)
if("cock_shape")
var/new_shape
new_shape = input(user, "Penis shape:", "Character Preference") as null|anything in GLOB.cock_shapes_list
if(new_shape)
features["cock_shape"] = new_shape
if("balls_color")
var/new_ballscolor = input(user, "Testicle Color:", "Character Preference") as color|null
if(new_ballscolor)
var/temp_hsv = RGBtoHSV(new_ballscolor)
if(new_ballscolor == "#000000")
features["balls_color"] = pref_species.default_color
else if((MUTCOLORS_PARTSONLY in pref_species.species_traits) || ReadHSV(temp_hsv)[3] >= ReadHSV("#202020")[3])
features["balls_color"] = sanitize_hexcolor(new_ballscolor)
else
user << "<span class='danger'>Invalid color. Your color is not bright enough.</span>"
if("egg_size")
var/new_size
var/list/egg_sizes = list(1,2,3)
new_size = input(user, "Egg Diameter(inches):", "Egg Size") as null|anything in egg_sizes
if(new_size)
features["eggsack_egg_size"] = new_size
if("egg_color")
var/new_egg_color = input(user, "Egg Color:", "Character Preference") as color|null
if(new_egg_color)
var/temp_hsv = RGBtoHSV(new_egg_color)
if(ReadHSV(temp_hsv)[3] >= ReadHSV("#202020")[3])
features["eggsack_egg_color"] = sanitize_hexcolor(new_egg_color)
else
user << "<span class='danger'>Invalid color. Your color is not bright enough.</span>"
if("breasts_size")
var/new_size
new_size = input(user, "Breast Size", "Character Preference") as null|anything in GLOB.breasts_size_list
if(new_size)
features["breasts_size"] = new_size
if("breasts_shape")
var/new_shape
new_shape = input(user, "Breast Shape", "Character Preference") as null|anything in GLOB.breasts_shapes_list
if(new_shape)
features["breasts_shape"] = new_shape
if("breasts_color")
var/new_breasts_color = input(user, "Breast Color:", "Character Preference") as color|null
if(new_breasts_color)
var/temp_hsv = RGBtoHSV(new_breasts_color)
if(new_breasts_color == "#000000")
features["breasts_color"] = pref_species.default_color
else if((MUTCOLORS_PARTSONLY in pref_species.species_traits) || ReadHSV(temp_hsv)[3] >= ReadHSV("#202020")[3])
features["breasts_color"] = sanitize_hexcolor(new_breasts_color)
else
user << "<span class='danger'>Invalid color. Your color is not bright enough.</span>"
if("vag_shape")
var/new_shape
new_shape = input(user, "Vagina Type", "Character Preference") as null|anything in GLOB.vagina_shapes_list
if(new_shape)
features["vag_shape"] = new_shape
if("vag_color")
var/new_vagcolor = input(user, "Vagina color:", "Character Preference") as color|null
if(new_vagcolor)
var/temp_hsv = RGBtoHSV(new_vagcolor)
if(new_vagcolor == "#000000")
features["vag_color"] = pref_species.default_color
else if((MUTCOLORS_PARTSONLY in pref_species.species_traits) || ReadHSV(temp_hsv)[3] >= ReadHSV("#202020")[3])
features["vag_color"] = sanitize_hexcolor(new_vagcolor)
else
user << "<span class='danger'>Invalid color. Your color is not bright enough.</span>"
if("input")
switch(href_list["preference"])
//genital code
if("genital_colour")
switch(features["genitals_use_skintone"])
if(TRUE)
features["genitals_use_skintone"] = FALSE
if(FALSE)
features["genitals_use_skintone"] = TRUE
else
features["genitals_use_skintone"] = FALSE
if("arousable")
switch(arousable)
if(TRUE)
arousable = FALSE
if(FALSE)
arousable = TRUE
else//failsafe
arousable = FALSE
if("has_cock")
switch(features["has_cock"])
if(TRUE)
features["has_cock"] = FALSE
if(FALSE)
features["has_cock"] = TRUE
features["has_ovi"] = FALSE
features["has_eggsack"] = FALSE
else
features["has_cock"] = FALSE
features["has_ovi"] = FALSE
if("has_balls")
switch(features["has_balls"])
if(TRUE)
features["has_balls"] = FALSE
if(FALSE)
features["has_balls"] = TRUE
features["has_eggsack"] = FALSE
else
features["has_balls"] = FALSE
features["has_eggsack"] = FALSE
if("has_ovi")
switch(features["has_ovi"])
if(TRUE)
features["has_ovi"] = FALSE
if(FALSE)
features["has_ovi"] = TRUE
features["has_cock"] = FALSE
features["has_balls"] = FALSE
else
features["has_ovi"] = FALSE
features["has_cock"] = FALSE
if("has_eggsack")
switch(features["has_eggsack"])
if(TRUE)
features["has_eggsack"] = FALSE
if(FALSE)
features["has_eggsack"] = TRUE
features["has_balls"] = FALSE
else
features["has_eggsack"] = FALSE
features["has_balls"] = FALSE
if("balls_internal")
switch(features["balls_internal"])
if(TRUE)
features["balls_internal"] = FALSE
if(FALSE)
features["balls_internal"] = TRUE
features["eggsack_internal"] = FALSE
else
features["balls_internal"] = FALSE
features["eggsack_internal"] = FALSE
if("eggsack_internal")
switch(features["eggsack_internal"])
if(TRUE)
features["eggsack_internal"] = FALSE
if(FALSE)
features["eggsack_internal"] = TRUE
features["balls_internal"] = FALSE
else
features["eggsack_internal"] = FALSE
features["balls_internal"] = FALSE
if("has_breasts")
switch(features["has_breasts"])
if(TRUE)
features["has_breasts"] = FALSE
if(FALSE)
features["has_breasts"] = TRUE
else
features["has_breasts"] = FALSE
if("has_vag")
switch(features["has_vag"])
if(TRUE)
features["has_vag"] = FALSE
if(FALSE)
features["has_vag"] = TRUE
else
features["has_vag"] = FALSE
if("has_womb")
switch(features["has_womb"])
if(TRUE)
features["has_womb"] = FALSE
if(FALSE)
features["has_womb"] = TRUE
else
features["has_womb"] = FALSE
if("exhibitionist")
switch(features["exhibitionist"])
if(TRUE)
features["exhibitionist"] = FALSE
if(FALSE)
features["exhibitionist"] = TRUE
else
features["exhibitionist"] = FALSE
else
switch(href_list["preference"])
if("widescreenpref")
widescreenpref = !widescreenpref
user.client.change_view(CONFIG_GET(string/default_view))
if("autostand")
autostand = !autostand
if("screenshake")
var/desiredshake = input(user, "Set the amount of screenshake you want. \n(0 = disabled, 100 = full, 200 = maximum.)", "Character Preference", screenshake) as null|num
if (!isnull(desiredshake))
screenshake = desiredshake
if("damagescreenshake")
switch(damagescreenshake)
if(0)
damagescreenshake = 1
if(1)
damagescreenshake = 2
if(2)
damagescreenshake = 0
else
damagescreenshake = 1
if("hound_sleeper")
toggles ^= MEDIHOUND_SLEEPER
// VORE SOUND TOGGLES
if("toggleeatingnoise")
toggles ^= EATING_NOISES
if("toggledigestionnoise")
toggles ^= DIGESTION_NOISES
if(href_list["preference"] == "gear")
if(href_list["clear_loadout"])
LAZYCLEARLIST(chosen_gear)
gear_points = initial(gear_points)
save_preferences()
if(href_list["select_category"])
for(var/i in GLOB.loadout_items)
if(i == href_list["select_category"])
gear_tab = i
if(href_list["toggle_gear_path"])
var/datum/gear/G = GLOB.loadout_items[gear_tab][html_decode(href_list["toggle_gear_path"])]
if(!G)
return
var/toggle = text2num(href_list["toggle_gear"])
if(!toggle && (G.type in chosen_gear))//toggling off and the item effectively is in chosen gear)
LAZYREMOVE(chosen_gear, G.type)
gear_points += initial(G.cost)
else if(toggle && (!(is_type_in_ref_list(G, chosen_gear))))
if(!is_loadout_slot_available(G.category))
to_chat(user, "<span class='danger'>You cannot take this loadout, as you've already chosen too many of the same category!</span>")
return
if(G.ckeywhitelist && G.ckeywhitelist.len && !(user.ckey in G.ckeywhitelist))
to_chat(user, "<span class='danger'>This is an item intended for donator use only. You are not authorized to use this item.</span>")
return
if(gear_points >= initial(G.cost))
LAZYADD(chosen_gear, G.type)
gear_points -= initial(G.cost)
/datum/preferences/proc/citadel_dat_replace(current_tab)
var/mob/user
//This proc is for menus other than game pref and char pref
. = "<center>"
. += "<a href='?_src_=prefs;preference=tab;tab=0' [current_tab == 0 ? "class='linkOn'" : ""]>Character Settings</a>"
. += "<a href='?_src_=prefs;preference=tab;tab=2' [current_tab == 2 ? "class='linkOn'" : ""]>Character Appearance</a>"
. += "<a href='?_src_=prefs;preference=tab;tab=3' [current_tab == 3 ? "class='linkOn'" : ""]>Loadout</a>"
. += "<a href='?_src_=prefs;preference=tab;tab=1' [current_tab == 1 ? "class='linkOn'" : ""]>Game Preferences</a>"
if(!path)
. += "<div class='notice'>Please create an account to save your preferences</div>"
. += "</center>"
. += "<HR>"
if(current_tab == 0)
. += "<b>Arousal:</b><a href='?_src_=prefs;preference=arousable'>[arousable == TRUE ? "Enabled" : "Disabled"]</a><BR>"
. += "<b>Exhibitionist:</b><a href='?_src_=prefs;preference=exhibitionist'>[features["exhibitionist"] == TRUE ? "Yes" : "No"]</a><BR>"
// game prefs
if(current_tab == 1)
//VORE SOUNDS
. += "<b>Hear Vore Sounds:</b> <a href='?_src_=prefs;preference=toggleeatingnoise'>[(toggles & EATING_NOISES) ? "Yes" : "No"]</a><br>"
. += "<b>Hear Vore Digestion Sounds:</b> <a href='?_src_=prefs;preference=toggledigestionnoise'>[(toggles & DIGESTION_NOISES) ? "Yes" : "No"]</a><br>"
. += "<b>Widescreen:</b> <a href='?_src_=prefs;preference=widescreenpref'>[widescreenpref ? "Enabled ([CONFIG_GET(string/default_view)])" : "Disabled (15x15)"]</a><br>"
. += "<b>Auto stand:</b> <a href='?_src_=prefs;preference=autostand'>[autostand ? "Enabled" : "Disabled"]</a><br>"
. += "<b>Screen Shake:</b> <a href='?_src_=prefs;preference=screenshake'>[(screenshake==100) ? "Full" : ((screenshake==0) ? "None" : "[screenshake]")]</a><br>"
if (user && user.client && !user.client.prefs.screenshake==0)
. += "<b>Damage Screen Shake:</b> <a href='?_src_=prefs;preference=damagescreenshake'>[(damagescreenshake==1) ? "On" : ((damagescreenshake==0) ? "Off" : "Only when down")]</a><br>"
//Character Appearance
if(current_tab == 2)
. += "<table><tr><td width='340px' height='300px' valign='top'>"
. += "<div class='statusDisplay'><img src=previewicon.png width=[preview_icon.Width()] height=[preview_icon.Height()]></div><br>"
. += "<a href='?_src_=prefs;preference=flavor_text;task=input'><b>Set Flavor Text</b></a><br>"
if(lentext(features["flavor_text"]) <= 40)
if(!lentext(features["flavor_text"]))
. += "\[...\]"
else
. += "[features["flavor_text"]]"
else
. += "[TextPreview(features["flavor_text"])]...<BR>"
. += "<h2>Body</h2>"
. += "<b>Gender:</b> <a href='?_src_=prefs;preference=gender'>[gender == MALE ? "Male" : "Female"]</a><BR>"
. += "<b>Species:</b><a href='?_src_=prefs;preference=species;task=input'>[pref_species.id]</a><BR>"
. += "<a href='?_src_=prefs;preference=all;task=random'>Random Body</A><BR>"
. += "<a href='?_src_=prefs;preference=all'>Always Random Body: [be_random_body ? "Yes" : "No"]</A><BR>"
if((MUTCOLORS in pref_species.species_traits) || (MUTCOLORS_PARTSONLY in pref_species.species_traits))
. += "<b>Primary Color: </b><span style='border: 1px solid #161616; background-color: #[features["mcolor"]];'>&nbsp;&nbsp;&nbsp;</span> <a href='?_src_=prefs;preference=mutant_color;task=input'>Change</a><BR>"
. += "<b>Secondary Color: </b><span style='border: 1px solid #161616; background-color: #[features["mcolor2"]];'>&nbsp;&nbsp;&nbsp;</span> <a href='?_src_=prefs;preference=mutant_color2;task=input'>Change</a><BR>"
. += "<b>Tertiary Color: </b><span style='border: 1px solid #161616; background-color: #[features["mcolor3"]];'>&nbsp;&nbsp;&nbsp;</span> <a href='?_src_=prefs;preference=mutant_color3;task=input'>Change</a><BR>"
if(pref_species.use_skintones)
. += "<b>Skin Tone: </b><a href='?_src_=prefs;preference=s_tone;task=input'>[skin_tone]</a><BR>"
. += "<b>Genitals Use Skintone:</b><a href='?_src_=prefs;preference=genital_colour'>[features["genitals_use_skintone"] == TRUE ? "Enabled" : "Disabled"]</a><BR>"
if(HAIR in pref_species.species_traits)
. += "<b>Hair Style: </b><a href='?_src_=prefs;preference=hair_style;task=input'>[hair_style]</a><BR>"
. += "<b>Hair Color: </b><span style='border:1px solid #161616; background-color: #[hair_color];'>&nbsp;&nbsp;&nbsp;</span> <a href='?_src_=prefs;preference=hair;task=input'>Change</a><BR>"
. += "<b>Facial Hair Style: </b><a href='?_src_=prefs;preference=facial_hair_style;task=input'>[facial_hair_style]</a><BR>"
. += "<b>Facial Hair Color: </b><span style='border: 1px solid #161616; background-color: #[facial_hair_color];'>&nbsp;&nbsp;&nbsp;</span> <a href='?_src_=prefs;preference=facial;task=input'>Change</a><BR>"
if(EYECOLOR in pref_species.species_traits)
. += "<b>Eye Color: </b><span style='border: 1px solid #161616; background-color: #[eye_color];'>&nbsp;&nbsp;&nbsp;</span> <a href='?_src_=prefs;preference=eyes;task=input'>Change</a><BR>"
if("tail_lizard" in pref_species.mutant_bodyparts)
. += "<b>Tail: </b><a href='?_src_=prefs;preference=tail_lizard;task=input'>[features["tail_lizard"]]</a><BR>"
else if("mam_tail" in pref_species.mutant_bodyparts)
. += "<b>Tail: </b><a href='?_src_=prefs;preference=mam_tail;task=input'>[features["mam_tail"]]</a><BR>"
else if("tail_human" in pref_species.mutant_bodyparts)
. += "<b>Tail: </b><a href='?_src_=prefs;preference=tail_human;task=input'>[features["tail_human"]]</a><BR>"
if("snout" in pref_species.mutant_bodyparts)
. += "<b>Snout: </b><a href='?_src_=prefs;preference=snout;task=input'>[features["snout"]]</a><BR>"
if("horns" in pref_species.mutant_bodyparts)
. += "<b>Horns: </b><a href='?_src_=prefs;preference=horns;task=input'>[features["horns"]]</a><BR>"
if("frills" in pref_species.mutant_bodyparts)
. += "<b>Frills: </b><a href='?_src_=prefs;preference=frills;task=input'>[features["frills"]]</a><BR>"
if("spines" in pref_species.mutant_bodyparts)
. += "<b>Spines: </b><a href='?_src_=prefs;preference=spines;task=input'>[features["spines"]]</a><BR>"
if("body_markings" in pref_species.mutant_bodyparts)
. += "<b>Body Markings: </b><a href='?_src_=prefs;preference=body_markings;task=input'>[features["body_markings"]]</a><BR>"
else if("mam_body_markings" in pref_species.mutant_bodyparts)
. += "<b>Body Markings: </b><a href='?_src_=prefs;preference=mam_body_markings;task=input'>[features["mam_body_markings"]]</a><BR>"
if("mam_ears" in pref_species.mutant_bodyparts)
. += "<b>Ears: </b><a href='?_src_=prefs;preference=mam_ears;task=input'>[features["mam_ears"]]</a><BR>"
else if("ears" in pref_species.mutant_bodyparts)
. += "<b>Ears: </b><a href='?_src_=prefs;preference=ears;task=input'>[features["ears"]]</a><BR>"
if("legs" in pref_species.mutant_bodyparts)
. += "<b>Legs: </b><a href='?_src_=prefs;preference=legs;task=input'>[features["legs"]]</a><BR>"
if("moth_wings" in pref_species.mutant_bodyparts)
. += "<b>Moth wings</b><a href='?_src_=prefs;preference=moth_wings;task=input'>[features["moth_wings"]]</a><BR>"
if("taur" in pref_species.mutant_bodyparts)
. += "<b>Taur: </b><a href='?_src_=prefs;preference=taur;task=input'>[features["taur"]]</a><BR>"
if("wings" in pref_species.mutant_bodyparts && GLOB.r_wings_list.len >1)
. += "<b>Wings: </b><a href='?_src_=prefs;preference=wings;task=input'>[features["wings"]]</a><BR>"
if("xenohead" in pref_species.mutant_bodyparts)
. += "<b>Caste: </b><a href='?_src_=prefs;preference=xenohead;task=input'>[features["xenohead"]]</a><BR>"
if("xenotail" in pref_species.mutant_bodyparts)
. += "<b>Tail: </b><a href='?_src_=prefs;preference=xenotail;task=input'>[features["xenotail"]]</a><BR>"
if("xenodorsal" in pref_species.mutant_bodyparts)
. += "<b>Dorsal Tubes: </b><a href='?_src_=prefs;preference=xenodorsal;task=input'>[features["xenodorsal"]]</a><BR>"
if("ipc_screen" in pref_species.mutant_bodyparts)
. += "<b>Screen:</b><a href='?_src_=prefs;preference=ipc_screen;task=input'>[features["ipc_screen"]]</a><BR>"
. += "</td><td width='300px' height='300px' valign='top'>"
. += "<h2>Clothing & Equipment</h2>"
. += "<b>Underwear:</b><a href ='?_src_=prefs;preference=underwear;task=input'>[underwear]</a><br>"
. += "<b>Undershirt:</b><a href ='?_src_=prefs;preference=undershirt;task=input'>[undershirt]</a><br>"
. += "<b>Socks:</b><a href ='?_src_=prefs;preference=socks;task=input'>[socks]</a><br>"
. += "<b>Backpack:</b><a href ='?_src_=prefs;preference=bag;task=input'>[backbag]</a><br>"
. += "<b>Uplink Location:</b><a href ='?_src_=prefs;preference=uplink_loc;task=input'>[uplink_spawn_loc]</a><br>"
. += "<h2>Genitals</h2>"
if(NOGENITALS in pref_species.species_traits)
. += "<b>Your species ([pref_species.name]) does not support genitals!</b><br>"
else
. += "<b>Has Penis:</b><a href='?_src_=prefs;preference=has_cock'>[features["has_cock"] == TRUE ? "Yes" : "No"]</a><BR>"
if(features["has_cock"] == TRUE)
if(pref_species.use_skintones && features["genitals_use_skintone"] == TRUE)
. += "<b>Penis Color:</b><span style='border: 1px solid #161616; background-color: #[skintone2hex(skin_tone)];'>&nbsp;&nbsp;&nbsp;</span>(Skin tone overriding)<BR>"
else
. += "<b>Penis Color:</b><span style='border: 1px solid #161616; background-color: #[features["cock_color"]];'>&nbsp;&nbsp;&nbsp;</span> <a href='?_src_=prefs;preference=cock_color;task=input'>Change</a><BR>"
// . += "<br>"
. += "<b>Penis Shape:</b> <a href='?_src_=prefs;preference=cock_shape;task=input'>[features["cock_shape"]]</a><BR>"
. += "<b>Penis Length:</b> <a href='?_src_=prefs;preference=cock_length;task=input'>[features["cock_length"]] inch(es)</a><BR>"
. += "<b>Has Testicles:</b><a href='?_src_=prefs;preference=has_balls'>[features["has_balls"] == TRUE ? "Yes" : "No"]</a><BR>"
if(features["has_balls"] == TRUE)
if(pref_species.use_skintones && features["genitals_use_skintone"] == TRUE)
. += "<b>Testicles Color:</b><span style='border: 1px solid #161616; background-color: #[skintone2hex(skin_tone)];'>&nbsp;&nbsp;&nbsp;</span>(Skin tone overriding)<BR>"
else
. += "<b>Testicles Color:</b><span style='border: 1px solid #161616; background-color: #[features["balls_color"]];'>&nbsp;&nbsp;&nbsp;</span> <a href='?_src_=prefs;preference=balls_color;task=input'>Change</a><BR>"
. += "<b>Has Vagina:</b><a href='?_src_=prefs;preference=has_vag'>[features["has_vag"] == TRUE ? "Yes" : "No"]</a><BR>"
if(features["has_vag"])
. += "<b>Vagina Type:</b> <a href='?_src_=prefs;preference=vag_shape;task=input'>[features["vag_shape"]]</a><BR>"
if(pref_species.use_skintones && features["genitals_use_skintone"] == TRUE)
. += "<b>Vagina Color:</b><span style='border: 1px solid #161616; background-color: #[skintone2hex(skin_tone)];'>&nbsp;&nbsp;&nbsp;</span>(Skin tone overriding)<BR>"
else
. += "<b>Vagina Color:</b><span style='border: 1px solid #161616; background-color: #[features["vag_color"]];'>&nbsp;&nbsp;&nbsp;</span> <a href='?_src_=prefs;preference=vag_color;task=input'>Change</a><BR>"
. += "<b>Has Womb:</b><a href='?_src_=prefs;preference=has_womb'>[features["has_womb"] == TRUE ? "Yes" : "No"]</a><BR>"
. += "<b>Has Breasts:</b><a href='?_src_=prefs;preference=has_breasts'>[features["has_breasts"] == TRUE ? "Yes" : "No"]</a><BR>"
if(features["has_breasts"])
if(pref_species.use_skintones && features["genitals_use_skintone"] == TRUE)
. += "<b>Color:</b><span style='border: 1px solid #161616; background-color: #[skintone2hex(skin_tone)];'>&nbsp;&nbsp;&nbsp;</span>(Skin tone overriding)<BR>"
else
. += "<b>Color:</b><span style='border: 1px solid #161616; background-color: #[features["breasts_color"]];'>&nbsp;&nbsp;&nbsp;</span> <a href='?_src_=prefs;preference=breasts_color;task=input'>Change</a><BR>"
. += "<b>Cup Size:</b><a href='?_src_=prefs;preference=breasts_size;task=input'>[features["breasts_size"]]</a><br>"
. += "<b>Breast Shape:</b><a href='?_src_=prefs;preference=breasts_shape;task=input'>[features["breasts_shape"]]</a><br>"
/*
. += "<h3>Ovipositor</h3>"
. += "<b>Has Ovipositor:</b><a href='?_src_=prefs;preference=has_ovi'>[features["has_ovi"] == TRUE ? "Yes" : "No"]</a>"
if(features["has_ovi"])
. += "<b>Ovi Color:</b><span style='border: 1px solid #161616; background-color: #[features["ovi_color"]];'>&nbsp;&nbsp;&nbsp;</span> <a href='?_src_=prefs;preference=ovi_color;task=input'>Change</a>"
. += "<h3>Eggsack</h3>"
. += "<b>Has Eggsack:</b><a href='?_src_=prefs;preference=has_eggsack'>[features["has_eggsack"] == TRUE ? "Yes" : "No"]</a><BR>"
if(features["has_eggsack"] == TRUE)
. += "<b>Color:</b><span style='border: 1px solid #161616; background-color: #[features["eggsack_color"]];'>&nbsp;&nbsp;&nbsp;</span> <a href='?_src_=prefs;preference=eggsack_color;task=input'>Change</a>"
. += "<b>Egg Color:</b><span style='border: 1px solid #161616; background-color: #[features["eggsack_egg_color"]];'>&nbsp;&nbsp;&nbsp;</span> <a href='?_src_=prefs;preference=egg_color;task=input'>Change</a>"
. += "<b>Egg Size:</b><a href='?_src_=prefs;preference=egg_size;task=input'>[features["eggsack_egg_size"]]\" Diameter</a>"
. += "</td>"
*/
. += "</td></tr></table>"
if(current_tab == 3)
if(!gear_tab)
gear_tab = GLOB.loadout_items[1]
. += "<table align='center' width='100%'>"
. += "<tr><td colspan=4><center><b><font color='[gear_points == 0 ? "#E62100" : "#CCDDFF"]'>[gear_points]</font> loadout points remaining.</b> \[<a href='?_src_=prefs;preference=gear;clear_loadout=1'>Clear Loadout</a>\]</center></td></tr>"
. += "<tr><td colspan=4><center>You can only choose one item per category, unless it's an item that spawns in your backpack or hands.</center></td></tr>"
. += "<tr><td colspan=4><center><b>"
var/firstcat = TRUE
for(var/i in GLOB.loadout_items)
if(firstcat)
firstcat = FALSE
else
. += " |"
if(i == gear_tab)
. += " <span class='linkOn'>[i]</span> "
else
. += " <a href='?_src_=prefs;preference=gear;select_category=[i]'>[i]</a> "
. += "</b></center></td></tr>"
. += "<tr><td colspan=4><hr></td></tr>"
. += "<tr><td colspan=4><b><center>[gear_tab]</center></b></td></tr>"
. += "<tr><td colspan=4><hr></td></tr>"
. += "<tr style='vertical-align:top;'><td width=15%><b>Name</b></td>"
. += "<td width=5% style='vertical-align:top'><b>Cost</b></td>"
. += "<td><font size=2><b>Restrictions</b></font></td>"
. += "<td><font size=2><b>Description</b></font></td></tr>"
for(var/j in GLOB.loadout_items[gear_tab])
var/datum/gear/gear = GLOB.loadout_items[gear_tab][j]
var/donoritem
if(gear.ckeywhitelist && gear.ckeywhitelist.len)
donoritem = TRUE
if(user && !(user.ckey in gear.ckeywhitelist))
continue
var/class_link = ""
if(gear.type in chosen_gear)
class_link = "style='white-space:normal;' class='linkOn' href='?_src_=prefs;preference=gear;toggle_gear_path=[html_encode(j)];toggle_gear=0'"
else if(gear_points <= 0)
class_link = "style='white-space:normal;' class='linkOff'"
else if(donoritem)
class_link = "style='white-space:normal;background:#ebc42e;' href='?_src_=prefs;preference=gear;toggle_gear_path=[html_encode(j)];toggle_gear=1'"
else
class_link = "style='white-space:normal;' href='?_src_=prefs;preference=gear;toggle_gear_path=[html_encode(j)];toggle_gear=1'"
. += "<tr style='vertical-align:top;'><td width=15%><a [class_link]>[j]</a></td>"
. += "<td width = 5% style='vertical-align:top'>[gear.cost]</td><td>"
if(islist(gear.restricted_roles))
if(gear.restricted_roles.len)
. += "<font size=2>"
. += gear.restricted_roles.Join(";")
. += "</font>"
. += "</td><td><font size=2><i>[gear.description]</i></font></td></tr>"
. += "</table>"
/datum/preferences/proc/is_loadout_slot_available(slot)
var/list/L
LAZYINITLIST(L)
@@ -34,3 +763,11 @@
else
if(L[slot_to_string(slot)] < DEFAULT_SLOT_AMT)
return TRUE
datum/preferences/copy_to(mob/living/carbon/human/character, icon_updates = 1)
..()
character.give_genitals(TRUE)
character.flavor_text = features["flavor_text"] //Let's update their flavor_text at least initially
character.canbearoused = arousable
if(icon_updates)
character.update_genitals()

6
modular_citadel/code/modules/client/preferences_savefile.dm
View File

@@ -1,4 +1,8 @@
/datum/preferences/proc/cit_character_pref_load(savefile/S)
//ipcs
S["feature_ipc_screen"] >> features["ipc_screen"]
features["ipc_screen"] = sanitize_inlist(features["ipc_screen"], GLOB.ipc_screens_list)
//Citadel
features["flavor_text"] = sanitize_text(features["flavor_text"], initial(features["flavor_text"]))
if(!features["mcolor2"] || features["mcolor"] == "#000")
@@ -21,6 +25,8 @@
gear_points -= initial(path.cost)
/datum/preferences/proc/cit_character_pref_save(savefile/S)
//ipcs
WRITE_FILE(S["feature_ipc_screen"], features["ipc_screen"])
//Citadel
WRITE_FILE(S["feature_genitals_use_skintone"], features["genitals_use_skintone"])
WRITE_FILE(S["feature_exhibitionist"], features["exhibitionist"])

2
modular_citadel/code/modules/clothing/suits/suits.dm
View File

@@ -8,6 +8,6 @@
/obj/item/clothing/suit/armor/hos/trenchcoat/cloak
name = "armored trenchcloak"
desc = "A trenchcoat enchanced with a special lightweight kevlar. This one appears to be designed to be draped over one's shoulders rather than worn normally.."
alternate_worn_icon = 'icons/mob/citadel/suit.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/suit.dmi'
icon_state = "hostrench"
item_state = "hostrench"

4
modular_citadel/code/modules/clothing/under/turtlenecks.dm
View File

@@ -43,8 +43,8 @@
item_color = "bb_turtle"
body_parts_covered = CHEST|ARMS
can_adjust = 1
icon = 'icons/obj/clothing/turtlenecks.dmi'
icon_override = 'icons/mob/citadel/uniforms.dmi'
icon = 'modular_citadel/icons/obj/clothing/turtlenecks.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
/obj/item/clothing/under/bb_sweater/black
name = "black sweater"

8
modular_citadel/code/modules/clothing/under/under.dm
View File

@@ -8,17 +8,17 @@
/obj/item/clothing/under/rank/security/skirt
name = "security skirt"
desc = "A tactical security skirt for officers complete with Nanotrasen belt buckle."
icon = 'icons/obj/clothing/cit_clothes.dmi'
icon = 'modular_citadel/icons/obj/clothing/cit_clothes.dmi'
icon_state = "secskirt"
icon_override = 'icons/mob/citadel/uniforms.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
item_state = "r_suit"
item_color = "secskirt"
/obj/item/clothing/under/rank/head_of_security/skirt
name = "head of security's skirt"
desc = "A security skirt decorated for those few with the dedication to achieve the position of Head of Security."
icon = 'icons/obj/clothing/cit_clothes.dmi'
icon = 'modular_citadel/icons/obj/clothing/cit_clothes.dmi'
icon_state = "hosskirt"
icon_override = 'icons/mob/citadel/uniforms.dmi'
icon_override = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
item_state = "gy_suit"
item_color = "hosskirt"

177
code/modules/mob/dead/new_player/sprite_accessories_Citadel.dm → modular_citadel/code/modules/mob/dead/new_player/sprite_accessories.dm
View File

@@ -1,16 +1,16 @@
/datum/sprite_accessory
var/extra = FALSE
var/extra_icon = 'icons/mob/mam_bodyparts.dmi'
var/extra_icon = 'modular_citadel/icons/mob/mam_bodyparts.dmi'
var/extra_color_src = MUTCOLORS2 //The color source for the extra overlay.
var/extra2 = FALSE
var/extra2_icon = 'icons/mob/mam_bodyparts.dmi'
var/extra2_icon = 'modular_citadel/icons/mob/mam_bodyparts.dmi'
var/extra2_color_src = MUTCOLORS3
var/list/ckeys_allowed
/* tbi eventually idk
/datum/sprite_accessory/legs/digitigrade_mam
name = "Anthro Digitigrade Legs"
icon = 'icons/mob/mam_bodyparts.dmi'
icon = 'modular_citadel/icons/mob/mam_bodyparts.dmi'
*/
/datum/sprite_accessory/moth_wings/none
@@ -37,128 +37,128 @@
name = "Red Panda"
icon_state = "ailurus"
color_src = 0
icon = 'icons/mob/mam_bodyparts.dmi'
icon = 'modular_citadel/icons/mob/mam_bodyparts.dmi'
/datum/sprite_accessory/ears/human/bear
name = "Bear"
icon_state = "bear"
icon = 'icons/mob/mam_bodyparts.dmi'
icon = 'modular_citadel/icons/mob/mam_bodyparts.dmi'
/datum/sprite_accessory/tails/human/bear
name = "Bear"
icon_state = "bear"
icon = 'icons/mob/mam_bodyparts.dmi'
icon = 'modular_citadel/icons/mob/mam_bodyparts.dmi'
/datum/sprite_accessory/tails_animated/human/bear
name = "Bear"
icon_state = "bear"
icon = 'icons/mob/mam_bodyparts.dmi'
icon = 'modular_citadel/icons/mob/mam_bodyparts.dmi'
/datum/sprite_accessory/tails/human/catbig
name = "Cat, Big"
icon_state = "catbig"
icon = 'icons/mob/mam_bodyparts.dmi'
icon = 'modular_citadel/icons/mob/mam_bodyparts.dmi'
/datum/sprite_accessory/tails_animated/human/catbig
name = "Cat, Big"
icon_state = "catbig"
icon = 'icons/mob/mam_bodyparts.dmi'
icon = 'modular_citadel/icons/mob/mam_bodyparts.dmi'
/datum/sprite_accessory/ears/human/cow
name = "Cow"
icon_state = "cow"
icon = 'icons/mob/mam_bodyparts.dmi'
icon = 'modular_citadel/icons/mob/mam_bodyparts.dmi'
gender_specific = 1
/datum/sprite_accessory/tails/human/cow
name = "Cow"
icon_state = "cow"
icon = 'icons/mob/mam_bodyparts.dmi'
icon = 'modular_citadel/icons/mob/mam_bodyparts.dmi'
/datum/sprite_accessory/tails_animated/human/cow
name = "Cow"
icon_state = "cow"
icon = 'icons/mob/mam_bodyparts.dmi'
icon = 'modular_citadel/icons/mob/mam_bodyparts.dmi'
/datum/sprite_accessory/tails/human/eevee
name = "Eevee"
icon_state = "eevee"
extra = TRUE
icon = 'icons/mob/mam_bodyparts.dmi'
icon = 'modular_citadel/icons/mob/mam_bodyparts.dmi'
/datum/sprite_accessory/ears/human/eevee
name = "Eevee"
icon_state = "eevee"
icon = 'icons/mob/mam_bodyparts.dmi'
icon = 'modular_citadel/icons/mob/mam_bodyparts.dmi'
/datum/sprite_accessory/tails_animated/human/eevee
name = "Eevee"
icon_state = "eevee"
extra = TRUE
icon = 'icons/mob/mam_bodyparts.dmi'
icon = 'modular_citadel/icons/mob/mam_bodyparts.dmi'
//datum/sprite_accessory/ears/elf
// name = "Elf"
// icon_state = "elf"
// icon = 'icons/mob/mam_bodyparts.dmi'
// icon = 'modular_citadel/icons/mob/mam_bodyparts.dmi'
// ckeys_allowed = list("atiefling")
/datum/sprite_accessory/ears/fennec
name = "Fennec"
icon_state = "fennec"
icon = 'icons/mob/mam_bodyparts.dmi'
icon = 'modular_citadel/icons/mob/mam_bodyparts.dmi'
hasinner = 1
/datum/sprite_accessory/tails/human/fennec
name = "Fennec"
icon_state = "fennec"
icon = 'icons/mob/mam_bodyparts.dmi'
icon = 'modular_citadel/icons/mob/mam_bodyparts.dmi'
/datum/sprite_accessory/tails_animated/human/fennec
name = "Fennec"
icon_state = "fennec"
icon = 'icons/mob/mam_bodyparts.dmi'
icon = 'modular_citadel/icons/mob/mam_bodyparts.dmi'
/datum/sprite_accessory/ears/fox
name = "Fox"
icon_state = "fox"
hasinner = 1
icon = 'icons/mob/mam_bodyparts.dmi'
icon = 'modular_citadel/icons/mob/mam_bodyparts.dmi'
/datum/sprite_accessory/tails/human/fox
name = "Fox"
icon_state = "fox"
icon = 'icons/mob/mam_bodyparts.dmi'
icon = 'modular_citadel/icons/mob/mam_bodyparts.dmi'
extra = TRUE
/datum/sprite_accessory/tails_animated/human/fox
name = "Fox"
icon_state = "fox"
icon = 'icons/mob/mam_bodyparts.dmi'
icon = 'modular_citadel/icons/mob/mam_bodyparts.dmi'
extra = TRUE
/datum/sprite_accessory/tails/human/horse
name = "Horse"
icon_state = "horse"
icon = 'icons/mob/mam_bodyparts.dmi'
icon = 'modular_citadel/icons/mob/mam_bodyparts.dmi'
color_src = HAIR
/datum/sprite_accessory/tails_animated/human/horse
name = "Horse"
icon_state = "horse"
icon = 'icons/mob/mam_bodyparts.dmi'
icon = 'modular_citadel/icons/mob/mam_bodyparts.dmi'
color_src = HAIR
/datum/sprite_accessory/tails/human/husky
name = "Husky"
icon_state = "husky"
icon = 'icons/mob/mam_bodyparts.dmi'
icon = 'modular_citadel/icons/mob/mam_bodyparts.dmi'
extra = TRUE
/datum/sprite_accessory/tails_animated/human/husky
name = "Husky"
icon_state = "husky"
icon = 'icons/mob/mam_bodyparts.dmi'
icon = 'modular_citadel/icons/mob/mam_bodyparts.dmi'
extra = TRUE
/datum/sprite_accessory/tails/human/kitsune
@@ -166,92 +166,92 @@
icon_state = "kitsune"
extra = TRUE
extra_color_src = MUTCOLORS2
icon = 'icons/mob/mam_bodyparts.dmi'
icon = 'modular_citadel/icons/mob/mam_bodyparts.dmi'
/datum/sprite_accessory/tails_animated/human/kitsune
name = "Kitsune"
icon_state = "kitsune"
extra = TRUE
extra_color_src = MUTCOLORS2
icon = 'icons/mob/mam_bodyparts.dmi'
icon = 'modular_citadel/icons/mob/mam_bodyparts.dmi'
/datum/sprite_accessory/ears/lab
name = "Dog, Floppy"
icon_state = "lab"
hasinner = 0
icon = 'icons/mob/mam_bodyparts.dmi'
icon = 'modular_citadel/icons/mob/mam_bodyparts.dmi'
/datum/sprite_accessory/ears/murid
name = "Murid"
icon_state = "murid"
icon = 'icons/mob/mam_bodyparts.dmi'
icon = 'modular_citadel/icons/mob/mam_bodyparts.dmi'
/datum/sprite_accessory/tails/human/murid
name = "Murid"
icon_state = "murid"
color_src = 0
icon = 'icons/mob/mam_bodyparts.dmi'
icon = 'modular_citadel/icons/mob/mam_bodyparts.dmi'
/datum/sprite_accessory/tails_animated/human/murid
name = "Murid"
icon_state = "murid"
color_src = 0
icon = 'icons/mob/mam_bodyparts.dmi'
icon = 'modular_citadel/icons/mob/mam_bodyparts.dmi'
/datum/sprite_accessory/ears/human/otie
name = "Otusian"
icon_state = "otie"
hasinner= 1
icon = 'icons/mob/mam_bodyparts.dmi'
icon = 'modular_citadel/icons/mob/mam_bodyparts.dmi'
/datum/sprite_accessory/tails/human/otie
name = "Otusian"
icon_state = "otie"
icon = 'icons/mob/mam_bodyparts.dmi'
icon = 'modular_citadel/icons/mob/mam_bodyparts.dmi'
/datum/sprite_accessory/tails_animated/human/otie
name = "Otusian"
icon_state = "otie"
icon = 'icons/mob/mam_bodyparts.dmi'
icon = 'modular_citadel/icons/mob/mam_bodyparts.dmi'
/datum/sprite_accessory/ears/human/rabbit
name = "Rabbit"
icon_state = "rabbit"
hasinner= 1
icon = 'icons/mob/mam_bodyparts.dmi'
icon = 'modular_citadel/icons/mob/mam_bodyparts.dmi'
/datum/sprite_accessory/tails/human/rabbit
name = "Rabbit"
icon_state = "rabbit"
color_src = 0
icon = 'icons/mob/mam_bodyparts.dmi'
icon = 'modular_citadel/icons/mob/mam_bodyparts.dmi'
/datum/sprite_accessory/tails_animated/human/rabbit
name = "Rabbit"
icon_state = "rabbit"
color_src = 0
icon = 'icons/mob/mam_bodyparts.dmi'
icon = 'modular_citadel/icons/mob/mam_bodyparts.dmi'
/datum/sprite_accessory/ears/human/sergal
name = "Sergal"
icon_state = "sergal"
hasinner= 1
icon = 'icons/mob/mam_bodyparts.dmi'
icon = 'modular_citadel/icons/mob/mam_bodyparts.dmi'
/datum/sprite_accessory/tails/human/sergal
name = "Sergal"
icon_state = "sergal"
icon = 'icons/mob/mam_bodyparts.dmi'
icon = 'modular_citadel/icons/mob/mam_bodyparts.dmi'
/datum/sprite_accessory/tails_animated/human/sergal
name = "Sergal"
icon_state = "sergal"
icon = 'icons/mob/mam_bodyparts.dmi'
icon = 'modular_citadel/icons/mob/mam_bodyparts.dmi'
/datum/sprite_accessory/ears/human/skunk
name = "skunk"
icon_state = "skunk"
icon = 'icons/mob/mam_bodyparts.dmi'
icon = 'modular_citadel/icons/mob/mam_bodyparts.dmi'
/datum/sprite_accessory/tails/human/skunk
name = "skunk"
@@ -267,62 +267,62 @@
name = "Shark"
icon_state = "shark"
color_src = MUTCOLORS
icon = 'icons/mob/mam_bodyparts.dmi'
icon = 'modular_citadel/icons/mob/mam_bodyparts.dmi'
/datum/sprite_accessory/tails/human/shark/datashark
name = "datashark"
icon_state = "datashark"
color_src = 0
icon = 'icons/mob/mam_bodyparts.dmi'
icon = 'modular_citadel/icons/mob/mam_bodyparts.dmi'
/datum/sprite_accessory/ears/squirrel
name = "Squirrel"
icon_state = "squirrel"
hasinner= 1
icon = 'icons/mob/mam_bodyparts.dmi'
icon = 'modular_citadel/icons/mob/mam_bodyparts.dmi'
/datum/sprite_accessory/tails/human/squirrel
name = "Squirrel"
icon_state = "squirrel"
icon = 'icons/mob/mam_bodyparts.dmi'
icon = 'modular_citadel/icons/mob/mam_bodyparts.dmi'
/datum/sprite_accessory/tails_animated/human/squirrel
name = "Squirrel"
icon_state = "squirrel"
icon = 'icons/mob/mam_bodyparts.dmi'
icon = 'modular_citadel/icons/mob/mam_bodyparts.dmi'
/datum/sprite_accessory/ears/wolf
name = "Wolf"
icon_state = "wolf"
hasinner = 1
icon = 'icons/mob/mam_bodyparts.dmi'
icon = 'modular_citadel/icons/mob/mam_bodyparts.dmi'
/datum/sprite_accessory/tails/human/wolf
name = "Wolf"
icon_state = "wolf"
icon = 'icons/mob/mam_bodyparts.dmi'
icon = 'modular_citadel/icons/mob/mam_bodyparts.dmi'
/datum/sprite_accessory/tails_animated/human/wolf
name = "Wolf"
icon_state = "wolf"
icon = 'icons/mob/mam_bodyparts.dmi'
icon = 'modular_citadel/icons/mob/mam_bodyparts.dmi'
/******************************************
*************** Body Parts ****************
*******************************************/
/datum/sprite_accessory/mam_ears
icon = 'icons/mob/mam_bodyparts.dmi'
icon = 'modular_citadel/icons/mob/mam_bodyparts.dmi'
/datum/sprite_accessory/mam_ears/none
name = "None"
/datum/sprite_accessory/mam_tails
icon = 'icons/mob/mam_bodyparts.dmi'
icon = 'modular_citadel/icons/mob/mam_bodyparts.dmi'
/datum/sprite_accessory/mam_tails/none
name = "None"
/datum/sprite_accessory/mam_tails_animated
icon = 'icons/mob/mam_bodyparts.dmi'
icon = 'modular_citadel/icons/mob/mam_bodyparts.dmi'
/datum/sprite_accessory/mam_tails_animated/none
name = "None"
@@ -334,48 +334,48 @@
/datum/sprite_accessory/snouts/none
name = "None"
icon_state = "none"
icon = 'icons/mob/mam_bodyparts.dmi'
icon = 'modular_citadel/icons/mob/mam_bodyparts.dmi'
/datum/sprite_accessory/snouts/bird
name = "Beak"
icon_state = "bird"
icon = 'icons/mob/mam_bodyparts.dmi'
icon = 'modular_citadel/icons/mob/mam_bodyparts.dmi'
color_src = MUTCOLORS3
/datum/sprite_accessory/snouts/lcanid
name = "Fox, Long"
icon_state = "lcanid"
icon = 'icons/mob/mam_bodyparts.dmi'
icon = 'modular_citadel/icons/mob/mam_bodyparts.dmi'
extra = TRUE
/datum/sprite_accessory/snouts/scanid
name = "Fox, Short"
icon_state = "scanid"
icon = 'icons/mob/mam_bodyparts.dmi'
icon = 'modular_citadel/icons/mob/mam_bodyparts.dmi'
extra = TRUE
/datum/sprite_accessory/snouts/wolf
name = "Wolf"
icon_state = "wolf"
icon = 'icons/mob/mam_bodyparts.dmi'
icon = 'modular_citadel/icons/mob/mam_bodyparts.dmi'
extra = TRUE
/datum/sprite_accessory/snouts/husky
name = "Husky"
icon_state = "husky"
icon = 'icons/mob/mam_bodyparts.dmi'
icon = 'modular_citadel/icons/mob/mam_bodyparts.dmi'
extra = TRUE
/datum/sprite_accessory/snouts/otie
name = "Otie"
icon_state = "otie"
icon = 'icons/mob/mam_bodyparts.dmi'
icon = 'modular_citadel/icons/mob/mam_bodyparts.dmi'
extra = TRUE
/datum/sprite_accessory/snouts/sergal
name = "Sergal"
icon_state = "sergal"
icon = 'icons/mob/mam_bodyparts.dmi'
icon = 'modular_citadel/icons/mob/mam_bodyparts.dmi'
color_src = MUTCOLORS2
/******************************************
@@ -497,7 +497,7 @@
/datum/sprite_accessory/mam_ears/husky
name = "Husky"
icon_state = "wolf"
icon = 'icons/mob/mam_bodyparts.dmi'
icon = 'modular_citadel/icons/mob/mam_bodyparts.dmi'
extra = TRUE
/datum/sprite_accessory/mam_tails/husky
@@ -564,19 +564,19 @@
icon_state = "cat"
hasinner = 1
color_src = HAIR
icon = 'icons/mob/mutant_bodyparts.dmi'
icon = 'modular_citadel/icons/mob/mutant_bodyparts.dmi'
/datum/sprite_accessory/mam_tails/neko
name = "Neko"
icon_state = "cat"
color_src = HAIR
icon = 'icons/mob/mutant_bodyparts.dmi'
icon = 'modular_citadel/icons/mob/mutant_bodyparts.dmi'
/datum/sprite_accessory/mam_tails_animated/neko
name = "Neko"
icon_state = "cat"
color_src = HAIR
icon = 'icons/mob/mutant_bodyparts.dmi'
icon = 'modular_citadel/icons/mob/mutant_bodyparts.dmi'
/datum/sprite_accessory/mam_ears/otie
name = "Otusian"
@@ -688,7 +688,7 @@
/datum/sprite_accessory/mam_body_markings
extra = TRUE
extra2 = TRUE
icon = 'icons/mob/mam_body_markings.dmi'
icon = 'modular_citadel/icons/mob/mam_body_markings.dmi'
/datum/sprite_accessory/mam_body_markings/none
name = "None"
@@ -802,10 +802,10 @@
************ Taur Bodies ******************
*******************************************/
/datum/sprite_accessory/taur
icon = 'icons/mob/mam_taur.dmi'
extra_icon = 'icons/mob/mam_taur.dmi'
icon = 'modular_citadel/icons/mob/mam_taur.dmi'
extra_icon = 'modular_citadel/icons/mob/mam_taur.dmi'
extra = TRUE
extra2_icon = 'icons/mob/mam_taur.dmi'
extra2_icon = 'modular_citadel/icons/mob/mam_taur.dmi'
extra2 = TRUE
center = TRUE
dimension_x = 64
@@ -876,7 +876,7 @@
//Xeno Dorsal Tubes
/datum/sprite_accessory/xeno_dorsal
icon = 'icons/mob/xeno_parts_greyscale.dmi'
icon = 'modular_citadel/icons/mob/xeno_parts_greyscale.dmi'
/datum/sprite_accessory/xeno_dorsal/none
name = "None"
@@ -884,21 +884,21 @@
/datum/sprite_accessory/xeno_dorsal/standard
name = "Standard"
icon_state = "standard"
icon = 'icons/mob/xeno_parts_greyscale.dmi'
icon = 'modular_citadel/icons/mob/xeno_parts_greyscale.dmi'
/datum/sprite_accessory/xeno_dorsal/royal
name = "Royal"
icon_state = "royal"
icon = 'icons/mob/xeno_parts_greyscale.dmi'
icon = 'modular_citadel/icons/mob/xeno_parts_greyscale.dmi'
/datum/sprite_accessory/xeno_dorsal/down
name = "Dorsal Down"
icon_state = "down"
icon = 'icons/mob/xeno_parts_greyscale.dmi'
icon = 'modular_citadel/icons/mob/xeno_parts_greyscale.dmi'
//Xeno Tail
/datum/sprite_accessory/xeno_tail
icon = 'icons/mob/xeno_parts_greyscale.dmi'
icon = 'modular_citadel/icons/mob/xeno_parts_greyscale.dmi'
/datum/sprite_accessory/xeno_tail/none
name = "None"
@@ -906,36 +906,45 @@
/datum/sprite_accessory/xeno_tail/standard
name = "Xenomorph Tail"
icon_state = "xeno"
icon = 'icons/mob/xeno_parts_greyscale.dmi'
icon = 'modular_citadel/icons/mob/xeno_parts_greyscale.dmi'
//Xeno Caste Heads
/datum/sprite_accessory/xeno_head
icon = 'icons/mob/xeno_parts_greyscale.dmi'
/datum/sprite_accessory/xeno_head/none
name = "None"
icon = 'modular_citadel/icons/mob/xeno_parts_greyscale.dmi'
/datum/sprite_accessory/xeno_head/standard
name = "Standard"
icon_state = "standard"
icon = 'icons/mob/xeno_parts_greyscale.dmi'
icon = 'modular_citadel/icons/mob/xeno_parts_greyscale.dmi'
/datum/sprite_accessory/xeno_head/royal
name = "royal"
icon_state = "royal"
icon = 'icons/mob/xeno_parts_greyscale.dmi'
icon = 'modular_citadel/icons/mob/xeno_parts_greyscale.dmi'
/datum/sprite_accessory/xeno_head/hollywood
name = "hollywood"
icon_state = "hollywood"
icon = 'icons/mob/xeno_parts_greyscale.dmi'
icon = 'modular_citadel/icons/mob/xeno_parts_greyscale.dmi'
/datum/sprite_accessory/xeno_head/warrior
name = "warrior"
icon_state = "warrior"
icon = 'icons/mob/xeno_parts_greyscale.dmi'
icon = 'modular_citadel/icons/mob/xeno_parts_greyscale.dmi'
// IPCs
/datum/sprite_accessory/screen
icon = 'modular_citadel/icons/mob/mutant_bodyparts.dmi'
color_src = null
/datum/sprite_accessory/screen/sunburst
name = "Sunburst"
icon_state = "sunburst"
/datum/sprite_accessory/screen/static
name = "Static"
icon_state = "static"
// *** Snooooow flaaaaake ***
/datum/sprite_accessory/mam_body_markings/guilmon

22
modular_citadel/code/modules/mob/living/carbon/human/species.dm
View File

@@ -55,3 +55,25 @@
playsound(target, 'sound/weapons/punchmiss.ogg', 25, 1, -1)
target.visible_message("<span class='danger'>[user] attempted to push [target]!</span>", \
"<span class='userdanger'>[user] attemped to push [target]!</span>", null, COMBAT_MESSAGE_RANGE)
////////////////////
/////BODYPARTS/////
////////////////////
/obj/item/bodypart/var/should_draw_citadel = FALSE
/mob/living/carbon/proc/draw_citadel_parts(undo = FALSE)
if(!undo)
for(var/O in bodyparts)
var/obj/item/bodypart/B = O
B.should_draw_citadel = TRUE
else
for(var/O in bodyparts)
var/obj/item/bodypart/B = O
B.should_draw_citadel = FALSE
/datum/species/proc/citadel_mutant_bodyparts(bodypart, mob/living/carbon/human/H)
switch(bodypart)
if("ipc_screen")
return GLOB.ipc_screens_list[H.dna.features["ipc_screen"]]

42
code/modules/mob/living/carbon/human/species_types/furrypeople.dm → modular_citadel/code/modules/mob/living/carbon/human/species_types/furrypeople.dm
View File

@@ -4,10 +4,11 @@
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")
default_features = list("mcolor" = "FFF","mcolor2" = "FFF","mcolor3" = "FFF", "body_markings" = "husky", "mam_tail" = "husky", "mam_ears" = "husky", "mam_body_markings" = "husky", "taur" = "None")
attack_verb = "claw"
attack_sound = 'sound/weapons/slash.ogg'
miss_sound = 'sound/weapons/slashmiss.ogg'
meat = /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/mammal
liked_food = MEAT | FRIED
disliked_food = TOXIC
@@ -18,6 +19,13 @@
/datum/species/mammal/qualifies_for_rank(rank, list/features)
return TRUE
/datum/species/mammal/on_species_gain(mob/living/carbon/human/C)
C.draw_citadel_parts()
. = ..()
/datum/species/mammal/on_species_loss(mob/living/carbon/human/C)
C.draw_citadel_parts(TRUE)
. = ..()
//AVIAN//
/datum/species/avian
name = "Avian"
@@ -40,6 +48,14 @@
/datum/species/avian/qualifies_for_rank(rank, list/features)
return TRUE
/datum/species/avian/on_species_gain(mob/living/carbon/human/C)
C.draw_citadel_parts()
. = ..()
/datum/species/avian/on_species_loss(mob/living/carbon/human/C)
C.draw_citadel_parts(TRUE)
. = ..()
//AQUATIC//
/datum/species/aquatic
name = "Aquatic"
@@ -62,6 +78,14 @@
/datum/species/aquatic/qualifies_for_rank(rank, list/features)
return TRUE
/datum/species/aquatic/on_species_gain(mob/living/carbon/human/C)
C.draw_citadel_parts()
. = ..()
/datum/species/aquatic/on_species_loss(mob/living/carbon/human/C)
C.draw_citadel_parts(TRUE)
. = ..()
//INSECT//
/datum/species/insect
name = "Insect"
@@ -83,6 +107,14 @@
/datum/species/insect/qualifies_for_rank(rank, list/features)
return TRUE
/datum/species/insect/on_species_gain(mob/living/carbon/human/C)
C.draw_citadel_parts()
. = ..()
/datum/species/insect/on_species_loss(mob/living/carbon/human/C)
C.draw_citadel_parts(TRUE)
. = ..()
//Alien//
/datum/species/xeno
// A cloning mistake, crossing human and xenomorph DNA
@@ -102,6 +134,14 @@
damage_overlay_type = "xeno"
liked_food = MEAT
/datum/species/xeno/on_species_gain(mob/living/carbon/human/C)
C.draw_citadel_parts()
. = ..()
/datum/species/xeno/on_species_loss(mob/living/carbon/human/C)
C.draw_citadel_parts(TRUE)
. = ..()
//Praise the Omnissiah, A challange worthy of my skills - HS
//EXOTIC//

23
modular_citadel/code/modules/mob/living/carbon/human/species_types/ipc.dm Normal file
View File

@@ -0,0 +1,23 @@
/datum/species/ipc
name = "IPC"
id = "ipc"
say_mod = "beeps"
default_color = "00FF00"
blacklisted = 0
sexes = 0
species_traits = list(MUTCOLORS,NOEYES)
mutant_bodyparts = list("ipc_screen")
default_features = list("ipc_screen" = "Sunburst")
species_traits = list(MUTCOLORS)
meat = /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/ipc
/datum/species/ipc/on_species_gain(mob/living/carbon/human/C)
C.draw_citadel_parts()
. = ..()
/datum/species/ipc/on_species_loss(mob/living/carbon/human/C)
C.draw_citadel_parts(TRUE)
. = ..()
/datum/species/ipc/get_spans()
return SPAN_ROBOT

8
modular_citadel/code/modules/mob/living/silicon/robot/robot_modules.dm
View File

@@ -48,7 +48,7 @@
can_be_pushed = FALSE
hat_offset = INFINITY
sleeper_overlay = "ksleeper"
cyborg_icon_override = 'icons/mob/widerobot.dmi'
cyborg_icon_override = 'modular_citadel/icons/mob/widerobot.dmi'
has_snowflake_deadsprite = TRUE
dogborg = TRUE
cyborg_pixel_offset = -16
@@ -79,7 +79,7 @@
can_be_pushed = FALSE
hat_offset = INFINITY
sleeper_overlay = "msleeper"
cyborg_icon_override = 'icons/mob/widerobot.dmi'
cyborg_icon_override = 'modular_citadel/icons/mob/widerobot.dmi'
has_snowflake_deadsprite = TRUE
dogborg = TRUE
cyborg_pixel_offset = -16
@@ -101,7 +101,7 @@
hat_offset = INFINITY
clean_on_move = TRUE
sleeper_overlay = "jsleeper"
cyborg_icon_override = 'icons/mob/widerobot.dmi'
cyborg_icon_override = 'modular_citadel/icons/mob/widerobot.dmi'
has_snowflake_deadsprite = TRUE
cyborg_pixel_offset = -16
dogborg = TRUE
@@ -161,7 +161,7 @@
cyborg_base_icon = "orepup"
moduleselect_icon = "orepup"
sleeper_overlay = "osleeper"
cyborg_icon_override = 'icons/mob/widerobot.dmi'
cyborg_icon_override = 'modular_citadel/icons/mob/widerobot.dmi'
has_snowflake_deadsprite = TRUE
cyborg_pixel_offset = -16

4
modular_citadel/code/modules/projectiles/guns/ballistic/flechette.dm
View File

@@ -42,7 +42,7 @@
/obj/item/ammo_box/magazine/flechette
name = "flechette magazine (armor piercing)"
icon = 'icons/obj/guns/cit_guns.dmi'
icon = 'modular_citadel/icons/obj/guns/cit_guns.dmi'
icon_state = "flechettemag"
ammo_type = /obj/item/ammo_casing/caseless/flechetteap
caliber = "flechette"
@@ -58,7 +58,7 @@
/obj/item/gun/ballistic/automatic/flechette
name = "\improper CX Flechette Launcher"
desc = "A flechette launching machine pistol with an unconventional bullpup frame."
icon = 'icons/obj/guns/cit_guns.dmi'
icon = 'modular_citadel/icons/obj/guns/cit_guns.dmi'
icon_state = "flechettegun"
item_state = "gun"
w_class = WEIGHT_CLASS_NORMAL

36
modular_citadel/code/modules/projectiles/guns/ballistic/handguns.dm
View File

@@ -3,7 +3,7 @@
/obj/item/gun/ballistic/automatic/pistol/antitank
name = "Anti Tank Pistol"
desc = "A massively impractical and silly monstrosity of a pistol that fires .50 calliber rounds. The recoil is likely to dislocate your wrist."
icon = 'icons/obj/guns/cit_guns.dmi'
icon = 'modular_citadel/icons/obj/guns/cit_guns.dmi'
icon_state = "atp"
item_state = "pistol"
recoil = 4
@@ -36,7 +36,7 @@
/obj/item/gun/ballistic/automatic/pistol/stealth
name = "stealth pistol"
desc = "A unique bullpup pistol with a compact frame. Has an integrated surpressor."
icon = 'icons/obj/guns/cit_guns.dmi'
icon = 'modular_citadel/icons/obj/guns/cit_guns.dmi'
icon_state = "stealthpistol"
w_class = WEIGHT_CLASS_SMALL
mag_type = /obj/item/ammo_box/magazine/m10mm
@@ -61,7 +61,7 @@
/obj/item/gun/ballistic/automatic/toy/pistol/stealth
name = "foam force stealth pistol"
desc = "A small, easily concealable toy bullpup handgun. Ages 8 and up."
icon = 'icons/obj/guns/cit_guns.dmi'
icon = 'modular_citadel/icons/obj/guns/cit_guns.dmi'
icon_state = "foamsp"
w_class = WEIGHT_CLASS_SMALL
mag_type = /obj/item/ammo_box/magazine/toy/pistol
@@ -108,7 +108,7 @@ obj/item/projectile/bullet/c10mm/soporific
/obj/item/ammo_box/magazine/m10mm/soporific
name = "pistol magazine (10mm soporific)"
icon = 'icons/obj/guns/cit_guns.dmi'
icon = 'modular_citadel/icons/obj/guns/cit_guns.dmi'
icon_state = "9x19pS"
desc = "A gun magazine. Loaded with rounds which inject the target with a variety of illegal substances to induce sleep in the target."
ammo_type = /obj/item/ammo_casing/c10mm/soporific
@@ -123,7 +123,7 @@ obj/item/projectile/bullet/c10mm/soporific
/obj/item/gun/ballistic/automatic/pistol/modular
name = "modular pistol"
desc = "A small, easily concealable 10mm handgun. Has a threaded barrel for suppressors."
icon = 'icons/obj/guns/cit_guns.dmi'
icon = 'modular_citadel/icons/obj/guns/cit_guns.dmi'
icon_state = "cde"
can_unsuppress = TRUE
obj_flags = UNIQUE_RENAME
@@ -154,7 +154,7 @@ obj/item/projectile/bullet/c10mm/soporific
/////////RAYGUN MEMES/////////
/obj/item/projectile/beam/lasertag/ray //the projectile, compatible with regular laser tag armor
icon = 'icons/obj/guns/cit_guns.dmi'
icon = 'modular_citadel/icons/obj/guns/cit_guns.dmi'
icon_state = "ray"
name = "ray bolt"
eyeblur = 0
@@ -166,7 +166,7 @@ obj/item/projectile/bullet/c10mm/soporific
/obj/item/gun/energy/laser/practice/raygun
name = "toy ray gun"
icon = 'icons/obj/guns/cit_guns.dmi'
icon = 'modular_citadel/icons/obj/guns/cit_guns.dmi'
icon_state = "raygun"
desc = "A toy laser with a classic, retro feel and look. Compatible with existing laser tag systems."
ammo_type = list(/obj/item/ammo_casing/energy/laser/raytag)
@@ -182,7 +182,7 @@ obj/item/projectile/bullet/c10mm/soporific
This model is coated with a special polychromic material. \
Has a small warning on the receiver that boldly states 'WARNING: WILL DETONATE UPON UNAUTHORIZED USE'. \
Uses 9mm bullets loaded into proprietary magazines."
icon = 'icons/obj/guns/cit_guns.dmi'
icon = 'modular_citadel/icons/obj/guns/cit_guns.dmi'
icon_state = "p37"
w_class = WEIGHT_CLASS_NORMAL
spawnwithmagazine = FALSE
@@ -203,15 +203,15 @@ obj/item/projectile/bullet/c10mm/soporific
///Defining all the colourable bits and displaying them///
/obj/item/gun/ballistic/automatic/pistol/p37/update_icon()
var/mutable_appearance/frame_overlay = mutable_appearance('icons/obj/guns/cit_guns.dmi', "p37_frame")
var/mutable_appearance/receiver_overlay = mutable_appearance('icons/obj/guns/cit_guns.dmi', "p37_receiver")
var/mutable_appearance/body_overlay = mutable_appearance('icons/obj/guns/cit_guns.dmi', "p37_body")
var/mutable_appearance/barrel_overlay = mutable_appearance('icons/obj/guns/cit_guns.dmi', "p37_barrel")
var/mutable_appearance/tip_overlay = mutable_appearance('icons/obj/guns/cit_guns.dmi', "p37_tip")
var/mutable_appearance/grip_overlay = mutable_appearance('icons/obj/guns/cit_guns.dmi', "p37_grip")
var/mutable_appearance/energy_overlay = mutable_appearance('icons/obj/guns/cit_guns.dmi', "p37_light")
var/mutable_appearance/arm_overlay = mutable_appearance('icons/obj/guns/cit_guns.dmi', "p37_arm")
var/mutable_appearance/arm_overlay_e = mutable_appearance('icons/obj/guns/cit_guns.dmi', "p37_arm-e")
var/mutable_appearance/frame_overlay = mutable_appearance('modular_citadel/icons/obj/guns/cit_guns.dmi', "p37_frame")
var/mutable_appearance/receiver_overlay = mutable_appearance('modular_citadel/icons/obj/guns/cit_guns.dmi', "p37_receiver")
var/mutable_appearance/body_overlay = mutable_appearance('modular_citadel/icons/obj/guns/cit_guns.dmi', "p37_body")
var/mutable_appearance/barrel_overlay = mutable_appearance('modular_citadel/icons/obj/guns/cit_guns.dmi', "p37_barrel")
var/mutable_appearance/tip_overlay = mutable_appearance('modular_citadel/icons/obj/guns/cit_guns.dmi', "p37_tip")
var/mutable_appearance/grip_overlay = mutable_appearance('modular_citadel/icons/obj/guns/cit_guns.dmi', "p37_grip")
var/mutable_appearance/energy_overlay = mutable_appearance('modular_citadel/icons/obj/guns/cit_guns.dmi', "p37_light")
var/mutable_appearance/arm_overlay = mutable_appearance('modular_citadel/icons/obj/guns/cit_guns.dmi', "p37_arm")
var/mutable_appearance/arm_overlay_e = mutable_appearance('modular_citadel/icons/obj/guns/cit_guns.dmi', "p37_arm-e")
if(frame_color)
frame_overlay.color = frame_color
@@ -346,7 +346,7 @@ obj/item/projectile/bullet/c10mm/soporific
/obj/item/ammo_box/magazine/m9mm/p37
name = "\improper P37 magazine (9mm frangible)"
desc = "A gun magazine. Loaded with plastic composite rounds which fragment upon impact to minimize collateral damage."
icon = 'icons/obj/guns/cit_guns.dmi'
icon = 'modular_citadel/icons/obj/guns/cit_guns.dmi'
icon_state = "11mm" //topkek
ammo_type = /obj/item/ammo_casing/c9mm/frangible
caliber = "9mm"

52
modular_citadel/code/modules/projectiles/guns/ballistic/magweapon.dm
View File

@@ -3,7 +3,7 @@
/obj/item/gun/ballistic/automatic/x9 //will be adminspawn only so ERT or something can use them
name = "\improper X9 Assault Rifle"
desc = "A rather old design of a cheap, reliable assault rifle made for combat against unknown enemies. Uses 5.56mm ammo."
icon = 'icons/obj/guns/cit_guns.dmi'
icon = 'modular_citadel/icons/obj/guns/cit_guns.dmi'
icon_state = "x9"
item_state = "arg"
slot_flags = 0
@@ -19,7 +19,7 @@
/obj/item/ammo_box/magazine/toy/x9
name = "foam force X9 magazine"
icon = 'icons/obj/guns/cit_guns.dmi'
icon = 'modular_citadel/icons/obj/guns/cit_guns.dmi'
icon_state = "toy9magazine"
max_ammo = 30
multiple_sprites = 2
@@ -28,7 +28,7 @@
/obj/item/gun/ballistic/automatic/x9/toy
name = "\improper Foam Force X9"
desc = "An old but reliable assault rifle made for combat against unknown enemies. Appears to be hastily converted. Ages 8 and up."
icon = 'icons/obj/guns/cit_guns.dmi'
icon = 'modular_citadel/icons/obj/guns/cit_guns.dmi'
icon_state = "toy9"
can_suppress = 0
obj_flags = 0
@@ -43,7 +43,7 @@
//////projectiles//////
/obj/item/projectile/bullet/mags
icon = 'icons/obj/guns/cit_guns.dmi'
icon = 'modular_citadel/icons/obj/guns/cit_guns.dmi'
icon_state = "magjectile"
damage = 15
armour_penetration = 10
@@ -53,7 +53,7 @@
light_color = LIGHT_COLOR_RED
/obj/item/projectile/bullet/nlmags //non-lethal boolets
icon = 'icons/obj/guns/cit_guns.dmi'
icon = 'modular_citadel/icons/obj/guns/cit_guns.dmi'
icon_state = "magjectile-nl"
damage = 0
knockdown = 0
@@ -70,14 +70,14 @@
/obj/item/ammo_casing/caseless/amags
desc = "A ferromagnetic slug intended to be launched out of a compatible weapon."
caliber = "mags"
icon = 'icons/obj/guns/cit_guns.dmi'
icon = 'modular_citadel/icons/obj/guns/cit_guns.dmi'
icon_state = "mag-casing-live"
projectile_type = /obj/item/projectile/bullet/mags
/obj/item/ammo_casing/caseless/anlmags
desc = "A specialized ferromagnetic slug designed with a less-than-lethal payload."
caliber = "mags"
icon = 'icons/obj/guns/cit_guns.dmi'
icon = 'modular_citadel/icons/obj/guns/cit_guns.dmi'
icon_state = "mag-casing-live"
projectile_type = /obj/item/projectile/bullet/nlmags
@@ -85,7 +85,7 @@
/obj/item/ammo_box/magazine/mmag/small
name = "magpistol magazine (non-lethal disabler)"
icon = 'icons/obj/guns/cit_guns.dmi'
icon = 'modular_citadel/icons/obj/guns/cit_guns.dmi'
icon_state = "nlmagmag"
ammo_type = /obj/item/ammo_casing/caseless/anlmags
caliber = "mags"
@@ -94,7 +94,7 @@
/obj/item/ammo_box/magazine/mmag/small/lethal
name = "magpistol magazine (lethal)"
icon = 'icons/obj/guns/cit_guns.dmi'
icon = 'modular_citadel/icons/obj/guns/cit_guns.dmi'
icon_state = "smallmagmag"
ammo_type = /obj/item/ammo_casing/caseless/amags
@@ -103,7 +103,7 @@
/obj/item/gun/ballistic/automatic/pistol/mag
name = "magpistol"
desc = "A handgun utilizing maglev technologies to propel a ferromagnetic slug to extreme velocities."
icon = 'icons/obj/guns/cit_guns.dmi'
icon = 'modular_citadel/icons/obj/guns/cit_guns.dmi'
icon_state = "magpistol"
force = 10
fire_sound = 'sound/weapons/magpistol.ogg'
@@ -160,7 +160,7 @@
/obj/item/projectile/bullet/reusable/foam_dart/mag
name = "magfoam dart"
icon = 'icons/obj/guns/cit_guns.dmi'
icon = 'modular_citadel/icons/obj/guns/cit_guns.dmi'
icon_state = "magjectile-toy"
ammo_type = /obj/item/ammo_casing/caseless/foam_dart/mag
light_range = 2
@@ -178,7 +178,7 @@
/obj/item/gun/ballistic/shotgun/toy/mag
name = "foam force magpistol"
desc = "A fancy toy sold alongside light-up foam force darts. Ages 8 and up."
icon = 'icons/obj/guns/cit_guns.dmi'
icon = 'modular_citadel/icons/obj/guns/cit_guns.dmi'
icon_state = "toymag"
item_state = "gun"
mag_type = /obj/item/ammo_box/magazine/internal/shot/toy/mag
@@ -198,7 +198,7 @@
///projectiles///
/obj/item/projectile/bullet/magrifle
icon = 'icons/obj/guns/cit_guns.dmi'
icon = 'modular_citadel/icons/obj/guns/cit_guns.dmi'
icon_state = "magjectile-large"
damage = 20
armour_penetration = 25
@@ -208,7 +208,7 @@
light_color = LIGHT_COLOR_RED
/obj/item/projectile/bullet/nlmagrifle //non-lethal boolets
icon = 'icons/obj/guns/cit_guns.dmi'
icon = 'modular_citadel/icons/obj/guns/cit_guns.dmi'
icon_state = "magjectile-large-nl"
damage = 0
knockdown = 0
@@ -224,14 +224,14 @@
/obj/item/ammo_casing/caseless/amagm
desc = "A large ferromagnetic slug intended to be launched out of a compatible weapon."
caliber = "magm"
icon = 'icons/obj/guns/cit_guns.dmi'
icon = 'modular_citadel/icons/obj/guns/cit_guns.dmi'
icon_state = "mag-casing-live"
projectile_type = /obj/item/projectile/bullet/magrifle
/obj/item/ammo_casing/caseless/anlmagm
desc = "A large, specialized ferromagnetic slug designed with a less-than-lethal payload."
caliber = "magm"
icon = 'icons/obj/guns/cit_guns.dmi'
icon = 'modular_citadel/icons/obj/guns/cit_guns.dmi'
icon_state = "mag-casing-live"
projectile_type = /obj/item/projectile/bullet/nlmagrifle
@@ -239,7 +239,7 @@
/obj/item/ammo_box/magazine/mmag/
name = "magrifle magazine (non-lethal disabler)"
icon = 'icons/obj/guns/cit_guns.dmi'
icon = 'modular_citadel/icons/obj/guns/cit_guns.dmi'
icon_state = "mediummagmag"
ammo_type = /obj/item/ammo_casing/caseless/anlmagm
caliber = "magm"
@@ -248,7 +248,7 @@
/obj/item/ammo_box/magazine/mmag/lethal
name = "magrifle magazine (lethal)"
icon = 'icons/obj/guns/cit_guns.dmi'
icon = 'modular_citadel/icons/obj/guns/cit_guns.dmi'
icon_state = "mediummagmag"
ammo_type = /obj/item/ammo_casing/caseless/amagm
max_ammo = 24
@@ -258,7 +258,7 @@
/obj/item/gun/ballistic/automatic/magrifle
name = "\improper Magnetic Rifle"
desc = "A simple upscalling of the technologies used in the magpistol, the magrifle is capable of firing slightly larger slugs in bursts. Compatible with the magpistol's slugs."
icon = 'icons/obj/guns/cit_guns.dmi'
icon = 'modular_citadel/icons/obj/guns/cit_guns.dmi'
icon_state = "magrifle"
item_state = "arg"
slot_flags = 0
@@ -309,7 +309,7 @@
/obj/item/ammo_box/magazine/toy/foamag
name = "foam force magrifle magazine"
icon = 'icons/obj/guns/cit_guns.dmi'
icon = 'modular_citadel/icons/obj/guns/cit_guns.dmi'
icon_state = "foamagmag"
max_ammo = 24
multiple_sprites = 2
@@ -346,7 +346,7 @@
///projectiles///
/obj/item/projectile/bullet/mags/hyper
icon = 'icons/obj/guns/cit_guns.dmi'
icon = 'modular_citadel/icons/obj/guns/cit_guns.dmi'
icon_state = "magjectile"
damage = 10
armour_penetration = 10
@@ -373,7 +373,7 @@
/obj/item/ammo_casing/caseless/ahyper
desc = "A large block of speciallized ferromagnetic material designed to be fired out of the experimental Hyper-Burst Rifle."
caliber = "hypermag"
icon = 'icons/obj/guns/cit_guns.dmi'
icon = 'modular_citadel/icons/obj/guns/cit_guns.dmi'
icon_state = "hyper-casing-live"
projectile_type = /obj/item/projectile/bullet/mags/hyper
pellets = 12
@@ -388,7 +388,7 @@
/obj/item/ammo_box/magazine/mhyper
name = "hyper-burst rifle magazine"
icon = 'icons/obj/guns/cit_guns.dmi'
icon = 'modular_citadel/icons/obj/guns/cit_guns.dmi'
icon_state = "hypermag-4"
ammo_type = /obj/item/ammo_casing/caseless/ahyper
caliber = "hypermag"
@@ -409,7 +409,7 @@
/obj/item/gun/ballistic/automatic/hyperburst
name = "\improper Hyper-Burst Rifle"
desc = "An extremely beefed up version of a stolen Nanotrasen weapon prototype, this 'rifle' is more like a cannon, with an extremely large bore barrel capable of generating several smaller magnetic 'barrels' to simultaneously launch multiple projectiles at once."
icon = 'icons/obj/guns/cit_guns.dmi'
icon = 'modular_citadel/icons/obj/guns/cit_guns.dmi'
icon_state = "hyperburst"
item_state = "arg"
slot_flags = 0
@@ -429,7 +429,7 @@
///toy memes///
/obj/item/projectile/beam/lasertag/mag //the projectile, compatible with regular laser tag armor
icon = 'icons/obj/guns/cit_guns.dmi'
icon = 'modular_citadel/icons/obj/guns/cit_guns.dmi'
icon_state = "magjectile-toy"
name = "lasertag magbolt"
forcedodge = TRUE //for penetration memes
@@ -450,7 +450,7 @@
name = "toy hyper-burst launcher"
desc = "A toy laser with a unique beam shaping lens that projects harmless bolts capable of going through objects. Compatible with existing laser tag systems."
ammo_type = list(/obj/item/ammo_casing/energy/laser/magtag)
icon = 'icons/obj/guns/cit_guns.dmi'
icon = 'modular_citadel/icons/obj/guns/cit_guns.dmi'
icon_state = "toyburst"
clumsy_check = FALSE
obj_flags = 0

20
modular_citadel/code/modules/projectiles/guns/ballistic/rifles.dm
View File

@@ -4,7 +4,7 @@
/obj/item/gun/ballistic/automatic/x9 //will be adminspawn only so ERT or something can use them
name = "\improper X9 Assault Rifle"
desc = "A rather old design of a cheap, reliable assault rifle made for combat against unknown enemies. Uses 5.56mm ammo."
icon = 'icons/obj/guns/cit_guns.dmi'
icon = 'modular_citadel/icons/obj/guns/cit_guns.dmi'
icon_state = "x9"
item_state = "arg"
slot_flags = 0
@@ -20,7 +20,7 @@
/obj/item/ammo_box/magazine/toy/x9
name = "foam force X9 magazine"
icon = 'icons/obj/guns/cit_guns.dmi'
icon = 'modular_citadel/icons/obj/guns/cit_guns.dmi'
icon_state = "toy9magazine"
max_ammo = 30
multiple_sprites = 2
@@ -29,7 +29,7 @@
/obj/item/gun/ballistic/automatic/x9/toy
name = "\improper Foam Force X9"
desc = "An old but reliable assault rifle made for combat against unknown enemies. Appears to be hastily converted. Ages 8 and up."
icon = 'icons/obj/guns/cit_guns.dmi'
icon = 'modular_citadel/icons/obj/guns/cit_guns.dmi'
icon_state = "toy9"
can_suppress = 0
obj_flags = 0
@@ -84,7 +84,7 @@
/obj/item/ammo_box/magazine/flechette
name = "flechette magazine (armor piercing)"
icon = 'icons/obj/guns/cit_guns.dmi'
icon = 'modular_citadel/icons/obj/guns/cit_guns.dmi'
icon_state = "flechettemag"
ammo_type = /obj/item/ammo_casing/caseless/flechetteap
caliber = "flechette"
@@ -100,7 +100,7 @@
/obj/item/gun/ballistic/automatic/flechette
name = "\improper CX Flechette Launcher"
desc = "A flechette launching machine pistol with an unconventional bullpup frame."
icon = 'icons/obj/guns/cit_guns.dmi'
icon = 'modular_citadel/icons/obj/guns/cit_guns.dmi'
icon_state = "flechettegun"
item_state = "gun"
w_class = WEIGHT_CLASS_NORMAL
@@ -163,7 +163,7 @@
*//////////////////////////////////////////////////////////////
/obj/item/ammo_box/magazine/toy/AM4B
name = "foam force AM4-B magazine"
icon = 'icons/obj/guns/cit_guns.dmi'
icon = 'modular_citadel/icons/obj/guns/cit_guns.dmi'
icon_state = "AM4MAG-60"
max_ammo = 60
multiple_sprites = 0
@@ -172,7 +172,7 @@
/obj/item/gun/ballistic/automatic/AM4B
name = "AM4-B"
desc = "A Relic from a bygone age. Nobody quite knows why it's here. Has a polychromic coating."
icon = 'icons/obj/guns/cit_guns.dmi'
icon = 'modular_citadel/icons/obj/guns/cit_guns.dmi'
icon_state = "AM4"
item_state = "arg"
mag_type = /obj/item/ammo_box/magazine/toy/AM4B
@@ -187,7 +187,7 @@
/obj/item/gun/ballistic/automatic/AM4B/update_icon()
..()
var/mutable_appearance/body_overlay = mutable_appearance('icons/obj/guns/cit_guns.dmi', "AM4-Body")
var/mutable_appearance/body_overlay = mutable_appearance('modular_citadel/icons/obj/guns/cit_guns.dmi', "AM4-Body")
if(body_color)
body_overlay.color = body_color
cut_overlays() //So that it doesn't keep stacking overlays non-stop on top of each other
@@ -212,7 +212,7 @@
/obj/item/ammo_box/magazine/toy/AM4C
name = "foam force AM4-C magazine"
icon = 'icons/obj/guns/cit_guns.dmi'
icon = 'modular_citadel/icons/obj/guns/cit_guns.dmi'
icon_state = "AM4MAG-32"
max_ammo = 32
multiple_sprites = 0
@@ -221,7 +221,7 @@
/obj/item/gun/ballistic/automatic/AM4C
name = "AM4-C"
desc = "A Relic from a bygone age. This one seems newer, yet less effective."
icon = 'icons/obj/guns/cit_guns.dmi'
icon = 'modular_citadel/icons/obj/guns/cit_guns.dmi'
icon_state = "AM4C"
item_state = "arg"
mag_type = /obj/item/ammo_box/magazine/toy/AM4C

8
modular_citadel/code/modules/projectiles/guns/ballistic/spinfusor.dm
View File

@@ -2,7 +2,7 @@
/obj/item/projectile/bullet/spinfusor
name ="spinfusor disk"
icon = 'icons/obj/guns/cit_guns.dmi'
icon = 'modular_citadel/icons/obj/guns/cit_guns.dmi'
icon_state= "spinner"
damage = 30
dismemberment = 25
@@ -17,7 +17,7 @@
desc = "A magnetic disk designed specifically for the Stormhammer magnetic cannon. Warning: extremely volatile!"
projectile_type = /obj/item/projectile/bullet/spinfusor
caliber = "spinfusor"
icon = 'icons/obj/guns/cit_guns.dmi'
icon = 'modular_citadel/icons/obj/guns/cit_guns.dmi'
icon_state = "disk"
throwforce = 15 //still deadly when thrown
throw_speed = 3
@@ -39,7 +39,7 @@
/obj/item/gun/ballistic/automatic/spinfusor
name = "Stormhammer Magnetic Cannon"
desc = "An innovative weapon utilizing mag-lev technology to spin up a magnetic fusor and launch it at extreme velocities."
icon = 'icons/obj/guns/cit_guns.dmi'
icon = 'modular_citadel/icons/obj/guns/cit_guns.dmi'
icon_state = "spinfusor"
item_state = "spinfusor"
mag_type = /obj/item/ammo_box/magazine/internal/spinfusor
@@ -68,7 +68,7 @@
/obj/item/ammo_box/aspinfusor
name = "ammo box (spinfusor disks)"
icon = 'icons/obj/guns/cit_guns.dmi'
icon = 'modular_citadel/icons/obj/guns/cit_guns.dmi'
icon_state = "spinfusorbox"
ammo_type = /obj/item/ammo_casing/caseless/spinfusor
max_ammo = 8

8
modular_citadel/code/modules/projectiles/guns/energy/energy_gun.dm
View File

@@ -16,10 +16,10 @@
obj/item/gun/energy/e_gun/cx
name = "\improper CX Model D Energy Gun"
desc = "An overpriced hybrid energy gun with two settings: disable, and kill. Manufactured by CX Armories. Has a polychromic coating."
icon = 'icons/obj/guns/cit_guns.dmi'
icon = 'modular_citadel/icons/obj/guns/cit_guns.dmi'
icon_state = "cxe"
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'
ammo_type = list(/obj/item/ammo_casing/energy/disabler, /obj/item/ammo_casing/energy/laser)
flight_x_offset = 15
flight_y_offset = 10
@@ -27,7 +27,7 @@ obj/item/gun/energy/e_gun/cx
obj/item/gun/energy/e_gun/cx/update_icon()
..()
var/mutable_appearance/body_overlay = mutable_appearance('icons/obj/guns/cit_guns.dmi', "cxegun_body")
var/mutable_appearance/body_overlay = mutable_appearance('modular_citadel/icons/obj/guns/cit_guns.dmi', "cxegun_body")
if(body_color)
body_overlay.color = body_color
add_overlay(body_overlay)

2
modular_citadel/code/modules/projectiles/guns/energy/laser.dm
View File

@@ -21,7 +21,7 @@
/obj/item/gun/energy/laser/carbine
name = "VGS blaster carbine"
desc = "A ruggedized laser carbine featuring much higher capacity and improved handling when compared to a normal blaster carbine."
icon = 'icons/obj/guns/cit_guns.dmi'
icon = 'modular_citadel/icons/obj/guns/cit_guns.dmi'
icon_state = "lasernew"
item_state = "laser"
force = 10

0
icons/mob/citadel/glasses.dmi → modular_citadel/icons/mob/citadel/glasses.dmi
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 182 B

After

Width:  |  Height:  |  Size: 182 B

0
icons/mob/citadel/guns_lefthand.dmi → modular_citadel/icons/mob/citadel/guns_lefthand.dmi
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 15 KiB

0
icons/mob/citadel/guns_righthand.dmi → modular_citadel/icons/mob/citadel/guns_righthand.dmi
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 16 KiB

0
icons/mob/citadel/head.dmi → modular_citadel/icons/mob/citadel/head.dmi
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 182 B

After

Width:  |  Height:  |  Size: 182 B

0
icons/mob/citadel/masks.dmi → modular_citadel/icons/mob/citadel/masks.dmi
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 182 B

After

Width:  |  Height:  |  Size: 182 B

0
icons/mob/citadel/neck.dmi → modular_citadel/icons/mob/citadel/neck.dmi
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 182 B

After

Width:  |  Height:  |  Size: 182 B

0
icons/mob/citadel/shoes.dmi → modular_citadel/icons/mob/citadel/shoes.dmi
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 182 B

After

Width:  |  Height:  |  Size: 182 B

0
icons/mob/citadel/suit.dmi → modular_citadel/icons/mob/citadel/suit.dmi
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 796 B

After

Width:  |  Height:  |  Size: 796 B

0
icons/mob/citadel/uniforms.dmi → modular_citadel/icons/mob/citadel/uniforms.dmi
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 49 KiB

After

Width:  |  Height:  |  Size: 49 KiB

0
icons/mob/citadel_refs/borg HUDs.dmi → modular_citadel/icons/mob/citadel_refs/borg HUDs.dmi
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

0
icons/mob/citadel_refs/cit_tail_reference.dmi → modular_citadel/icons/mob/citadel_refs/cit_tail_reference.dmi
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 82 KiB

After

Width:  |  Height:  |  Size: 82 KiB

0
icons/mob/citadel_refs/cit_wings.dmi → modular_citadel/icons/mob/citadel_refs/cit_wings.dmi
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 8.5 KiB

After

Width:  |  Height:  |  Size: 8.5 KiB

0
icons/mob/citadel_refs/dogborg animations.dmi → modular_citadel/icons/mob/citadel_refs/dogborg animations.dmi
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 41 KiB

After

Width:  |  Height:  |  Size: 41 KiB

0
icons/mob/citadel_refs/furry_parts_greyscale.dmi → modular_citadel/icons/mob/citadel_refs/furry_parts_greyscale.dmi
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.1 KiB

After

Width:  |  Height:  |  Size: 5.1 KiB

0
icons/mob/citadel_refs/furryrace_references.dmi → modular_citadel/icons/mob/citadel_refs/furryrace_references.dmi
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 274 KiB

After

Width:  |  Height:  |  Size: 274 KiB

0
icons/mob/citadel_refs/furrytail_references.dmi → modular_citadel/icons/mob/citadel_refs/furrytail_references.dmi
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 70 KiB

After

Width:  |  Height:  |  Size: 70 KiB

0
icons/mob/citadel_refs/snowflake_parts.dmi → modular_citadel/icons/mob/citadel_refs/snowflake_parts.dmi
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.7 KiB

After

Width:  |  Height:  |  Size: 2.7 KiB

0
icons/mob/citadel_refs/taur_referencesVOREbellies.dmi → modular_citadel/icons/mob/citadel_refs/taur_referencesVOREbellies.dmi
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 114 KiB

After

Width:  |  Height:  |  Size: 114 KiB

0
icons/mob/citadel_refs/widerobot_vr.dmi → modular_citadel/icons/mob/citadel_refs/widerobot_vr.dmi
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 342 KiB

After

Width:  |  Height:  |  Size: 342 KiB

0
icons/mob/mam_body_markings.dmi → modular_citadel/icons/mob/mam_body_markings.dmi
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 44 KiB

After

Width:  |  Height:  |  Size: 44 KiB

0
icons/mob/mam_bodyparts.dmi → modular_citadel/icons/mob/mam_bodyparts.dmi
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 50 KiB

After

Width:  |  Height:  |  Size: 50 KiB

0
icons/mob/mam_taur.dmi → modular_citadel/icons/mob/mam_taur.dmi
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 38 KiB

After

Width:  |  Height:  |  Size: 38 KiB

BIN
modular_citadel/icons/mob/mutant_bodyparts.dmi Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 29 KiB

0
icons/mob/werenerd.dmi → modular_citadel/icons/mob/werenerd.dmi
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 128 KiB

After

Width:  |  Height:  |  Size: 128 KiB

0
icons/mob/werenerdleap.dmi → modular_citadel/icons/mob/werenerdleap.dmi
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.7 KiB

After

Width:  |  Height:  |  Size: 4.7 KiB

0
icons/mob/widerobot.dmi → modular_citadel/icons/mob/widerobot.dmi
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 221 KiB

After

Width:  |  Height:  |  Size: 221 KiB

0
icons/mob/xeno_parts_greyscale.dmi → modular_citadel/icons/mob/xeno_parts_greyscale.dmi
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.2 KiB

After

Width:  |  Height:  |  Size: 3.2 KiB

0
icons/obj/VGProjectile.dmi → modular_citadel/icons/obj/VGProjectile.dmi
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1016 B

After

Width:  |  Height:  |  Size: 1016 B

0
icons/obj/clothing/cit_clothes.dmi → modular_citadel/icons/obj/clothing/cit_clothes.dmi
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 594 B

After

Width:  |  Height:  |  Size: 594 B

0
icons/obj/clothing/cit_hats.dmi → modular_citadel/icons/obj/clothing/cit_hats.dmi
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 285 B

After

Width:  |  Height:  |  Size: 285 B

BIN
modular_citadel/icons/obj/clothing/turtlenecks.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 307 B

After

Width:  |  Height:  |  Size: 1.1 KiB

0
icons/obj/clothing/vg_clothes.dmi → modular_citadel/icons/obj/clothing/vg_clothes.dmi
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 50 KiB

After

Width:  |  Height:  |  Size: 50 KiB

BIN
modular_citadel/icons/obj/food/food.dmi Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.3 KiB

BIN
modular_citadel/icons/obj/foods.dmi Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 898 B

0
icons/obj/guns/VGguns.dmi → modular_citadel/icons/obj/guns/VGguns.dmi
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.2 KiB

After

Width:  |  Height:  |  Size: 6.2 KiB

0
icons/obj/guns/cit_guns.dmi → modular_citadel/icons/obj/guns/cit_guns.dmi
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 42 KiB

After

Width:  |  Height:  |  Size: 42 KiB

BIN
modular_citadel/sound/voice/scream_cat.ogg Normal file
View File

Binary file not shown.

BIN
modular_citadel/sound/voice/scream_f1.ogg Normal file
View File

Binary file not shown.

BIN
modular_citadel/sound/voice/scream_f2.ogg Normal file
View File

Binary file not shown.

BIN
modular_citadel/sound/voice/scream_f3.ogg Normal file
View File

Binary file not shown.

BIN
modular_citadel/sound/voice/scream_lizard.ogg Normal file
View File

Binary file not shown.

BIN
modular_citadel/sound/voice/scream_m.ogg Normal file
View File

Binary file not shown.

BIN
modular_citadel/sound/voice/scream_m1.ogg Normal file
View File

Binary file not shown.

BIN
modular_citadel/sound/voice/scream_m2.ogg Normal file
View File

Binary file not shown.

BIN
modular_citadel/sound/voice/scream_monkey.ogg Normal file
View File

Binary file not shown.

BIN
modular_citadel/sound/voice/scream_moth.ogg Normal file
View File

Binary file not shown.

BIN
modular_citadel/sound/voice/scream_silicon.ogg Normal file
View File

Binary file not shown.

BIN
modular_citadel/sound/voice/scream_skeleton.ogg Normal file
View File

Binary file not shown.

BIN
modular_citadel/sound/voice/snap.ogg Normal file
View File

Binary file not shown.

BIN
modular_citadel/sound/voice/snap2.ogg Normal file
View File

Binary file not shown.

BIN
modular_citadel/sound/voice/snap3.ogg Normal file
View File

Binary file not shown.

6
tgstation.dme
View File

@@ -1770,7 +1770,6 @@
#include "code\modules\mob\dead\new_player\poll.dm"
#include "code\modules\mob\dead\new_player\preferences_setup.dm"
#include "code\modules\mob\dead\new_player\sprite_accessories.dm"
#include "code\modules\mob\dead\new_player\sprite_accessories_Citadel.dm"
#include "code\modules\mob\dead\observer\login.dm"
#include "code\modules\mob\dead\observer\logout.dm"
#include "code\modules\mob\dead\observer\observer.dm"
@@ -1872,7 +1871,6 @@
#include "code\modules\mob\living\carbon\human\species_types\corporate.dm"
#include "code\modules\mob\living\carbon\human\species_types\dullahan.dm"
#include "code\modules\mob\living\carbon\human\species_types\flypeople.dm"
#include "code\modules\mob\living\carbon\human\species_types\furrypeople.dm"
#include "code\modules\mob\living\carbon\human\species_types\golems.dm"
#include "code\modules\mob\living\carbon\human\species_types\humans.dm"
#include "code\modules\mob\living\carbon\human\species_types\jellypeople.dm"
@@ -2635,6 +2633,7 @@
#include "modular_citadel\code\game\objects\effects\temporary_visuals\projectiles\tracer.dm"
#include "modular_citadel\code\game\objects\items\handcuffs.dm"
#include "modular_citadel\code\game\objects\items\holy_weapons.dm"
#include "modular_citadel\code\game\objects\items\meat.dm"
#include "modular_citadel\code\game\objects\items\stunsword.dm"
#include "modular_citadel\code\game\objects\items\circuitboards\machine_circuitboards.dm"
#include "modular_citadel\code\game\objects\items\devices\aicard.dm"
@@ -2728,6 +2727,7 @@
#include "modular_citadel\code\modules\mining\mine_items.dm"
#include "modular_citadel\code\modules\mob\cit_emotes.dm"
#include "modular_citadel\code\modules\mob\mob.dm"
#include "modular_citadel\code\modules\mob\dead\new_player\sprite_accessories.dm"
#include "modular_citadel\code\modules\mob\living\damage_procs.dm"
#include "modular_citadel\code\modules\mob\living\living.dm"
#include "modular_citadel\code\modules\mob\living\carbon\carbon.dm"
@@ -2737,6 +2737,8 @@
#include "modular_citadel\code\modules\mob\living\carbon\human\human_movement.dm"
#include "modular_citadel\code\modules\mob\living\carbon\human\life.dm"
#include "modular_citadel\code\modules\mob\living\carbon\human\species.dm"
#include "modular_citadel\code\modules\mob\living\carbon\human\species_types\furrypeople.dm"
#include "modular_citadel\code\modules\mob\living\carbon\human\species_types\ipc.dm"
#include "modular_citadel\code\modules\mob\living\carbon\human\species_types\jellypeople.dm"
#include "modular_citadel\code\modules\mob\living\silicon\robot\dogborg_equipment.dm"
#include "modular_citadel\code\modules\mob\living\silicon\robot\robot.dm"