Overhauls and 2/28 sync (#244)
* map tweaks/shuttle engines * helpers and defines * global/onclick * controllers and datums * mapping * game folder * some other stuff * some modules * modules that aren't mobs * some mob stuff * new player stuff * mob living * silicon stuff * simple animal things * carbon/ayylmao * update_icons * carbon/human * sounds and tools * icons and stuff * hippie grinder changes + tgui * kitchen.dmi * compile issues fixed * mapfix * Mapfixes 2.0 * mapedit2.0 * mapmerger pls * Revert "mapedit2.0" This reverts commit 74139a3cacea10df7aafca06c0a10bd3daf3a481. * clean up vore folder + 2 hotfixes * admin ticket refinement * Blob tweaks and LAZYADD * LAZYADD IS LAZY * Magic strings purged * DEFINES NEED HIGHER PRIORITIES * Only a sleepless idiot deals in absolute TRUE|FALSE * u h g * progress bar fix * reverts ticket logs * there's always that one guy * fixes and stuff * 2/27 fixes * game folder stuff * stats * some modules again * clothing stuff gets vg clothing out of the main files * everything not mobs again * mob stuff * maps, tgui, sql stuff * icons * additional fixes and compile errors * don't need this anymore * Oh right this isn't needed anymore * maint bar re-added * that doesn't need to be here * stupid events * wtfeven * probably makes Travis happy * don't care to fix the grinder atm * fixes vending sprites, changes turret * lethal, not lethals * overylays are finicky creatures * lazy fix for bleeding edgy (#252) * map tweaks/shuttle engines * helpers and defines * global/onclick * controllers and datums * mapping * game folder * some other stuff * some modules * modules that aren't mobs * some mob stuff * new player stuff * mob living * silicon stuff * simple animal things * carbon/ayylmao * update_icons * carbon/human * sounds and tools * icons and stuff * hippie grinder changes + tgui * kitchen.dmi * compile issues fixed * mapfix * Mapfixes 2.0 * mapedit2.0 * mapmerger pls * Revert "mapedit2.0" This reverts commit 74139a3cacea10df7aafca06c0a10bd3daf3a481. * clean up vore folder + 2 hotfixes * admin ticket refinement * Blob tweaks and LAZYADD * LAZYADD IS LAZY * Magic strings purged * DEFINES NEED HIGHER PRIORITIES * Only a sleepless idiot deals in absolute TRUE|FALSE * u h g * progress bar fix * reverts ticket logs * there's always that one guy * fixes and stuff * 2/27 fixes * game folder stuff * stats * some modules again * clothing stuff gets vg clothing out of the main files * everything not mobs again * mob stuff * maps, tgui, sql stuff * icons * additional fixes and compile errors * don't need this anymore * Oh right this isn't needed anymore * maint bar re-added * that doesn't need to be here * stupid events * wtfeven * probably makes Travis happy * don't care to fix the grinder atm * fixes vending sprites, changes turret * lethal, not lethals * overylays are finicky creatures
This commit is contained in:
Poojawa
@@ -25,7 +25,7 @@
|
||||
icon_state = "security"
|
||||
item_state = "gy_suit"
|
||||
item_color = "security"
|
||||
|
||||
|
||||
|
||||
/obj/item/clothing/under/rank/warden
|
||||
name = "security suit"
|
||||
@@ -133,10 +133,11 @@
|
||||
item_color = "blueshift"
|
||||
can_adjust = 0
|
||||
|
||||
|
||||
/obj/item/clothing/under/rank/security/sneaksuit
|
||||
name = "sneaking suit"
|
||||
desc = "It's made of a strong material developed by the Soviet Union centuries ago which provides robust protection."
|
||||
icon_state = "sneakingsuit"
|
||||
item_state = "sneakingsuit"
|
||||
item_color = "sneakingsuit"
|
||||
can_adjust = 0
|
||||
can_adjust = 0
|
||||
@@ -654,321 +654,3 @@
|
||||
icon_state = "hostanclothes"
|
||||
item_state = "hostanclothes"
|
||||
item_color = "hostanclothes"
|
||||
|
||||
/obj/item/clothing/under/stripper_pink
|
||||
name = "pink stripper outfit"
|
||||
icon_state = "stripper_p"
|
||||
item_state = "stripper_p"
|
||||
item_color = "stripper_p"
|
||||
can_adjust = 0
|
||||
|
||||
/obj/item/clothing/under/stripper_green
|
||||
name = "green stripper outfit"
|
||||
icon_state = "stripper_g"
|
||||
item_state = "stripper_g"
|
||||
item_color = "stripper_g"
|
||||
can_adjust = 0
|
||||
|
||||
|
||||
/obj/item/clothing/under/wedding/bride_orange
|
||||
name = "orange wedding dress"
|
||||
desc = "A big and puffy orange dress."
|
||||
icon_state = "bride_orange"
|
||||
item_state = "bride_orange"
|
||||
item_color = "bride_orange"
|
||||
can_adjust = 0
|
||||
|
||||
/obj/item/clothing/under/wedding/bride_purple
|
||||
name = "purple wedding dress"
|
||||
desc = "A big and puffy purple dress."
|
||||
icon_state = "bride_purple"
|
||||
item_state = "bride_purple"
|
||||
item_color = "bride_purple"
|
||||
can_adjust = 0
|
||||
|
||||
/obj/item/clothing/under/wedding/bride_blue
|
||||
name = "blue wedding dress"
|
||||
desc = "A big and puffy blue dress."
|
||||
icon_state = "bride_blue"
|
||||
item_state = "bride_blue"
|
||||
item_color = "bride_blue"
|
||||
can_adjust = 0
|
||||
|
||||
/obj/item/clothing/under/wedding/bride_red
|
||||
name = "red wedding dress"
|
||||
desc = "A big and puffy red dress."
|
||||
icon_state = "bride_red"
|
||||
item_state = "bride_red"
|
||||
item_color = "bride_red"
|
||||
can_adjust = 0
|
||||
|
||||
/obj/item/clothing/under/wedding/bride_white
|
||||
name = "white wedding dress"
|
||||
desc = "A white wedding gown made from the finest silk."
|
||||
icon_state = "bride_white"
|
||||
item_state = "bride_white"
|
||||
item_color = "bride_white"
|
||||
can_adjust = 0
|
||||
|
||||
/obj/item/clothing/under/mankini
|
||||
name = "pink mankini"
|
||||
icon_state = "mankini"
|
||||
item_state = "mankini"
|
||||
item_color = "mankini"
|
||||
can_adjust = 0
|
||||
|
||||
/obj/item/clothing/under/psysuit
|
||||
name = "dark undersuit"
|
||||
desc = "A thick, layered grey undersuit lined with power cables. Feels a little like wearing an electrical storm."
|
||||
icon_state = "psysuit"
|
||||
item_state = "psysuit"
|
||||
item_color = "psysuit"
|
||||
can_adjust = 0
|
||||
|
||||
/obj/item/clothing/under/officeruniform
|
||||
name = "officer's uniform"
|
||||
desc = "Bestraft die Juden fur ihre Verbrechen."
|
||||
icon_state = "officeruniform"
|
||||
item_state = "officeruniform"
|
||||
item_color = "officeruniform"
|
||||
can_adjust = 0
|
||||
|
||||
/obj/item/clothing/under/soldieruniform
|
||||
name = "soldier's uniform"
|
||||
desc = "Bestraft die Verbundeten fur ihren Widerstand."
|
||||
icon_state = "soldieruniform"
|
||||
item_state = "soldieruniform"
|
||||
item_color = "soldieruniform"
|
||||
can_adjust = 0
|
||||
|
||||
/obj/item/clothing/under/squatter_outfit
|
||||
name = "slav squatter tracksuit"
|
||||
desc = "Cyka blyat."
|
||||
icon_state = "squatteroutfit"
|
||||
item_state = "squatteroutfit"
|
||||
item_color = "squatteroutfit"
|
||||
can_adjust = 0
|
||||
|
||||
/obj/item/clothing/under/russobluecamooutfit
|
||||
name = "russian blue camo"
|
||||
desc = "Drop and give me dvadtsat!"
|
||||
icon_state = "russobluecamo"
|
||||
item_state = "russobluecamo"
|
||||
item_color = "russobluecamo"
|
||||
can_adjust = 0
|
||||
|
||||
/obj/item/clothing/under/stilsuit
|
||||
name = "stillsuit"
|
||||
desc = "Designed to preserve bodymoisture."
|
||||
icon_state = "stilsuit"
|
||||
item_state = "stilsuit"
|
||||
item_color = "stilsuit"
|
||||
can_adjust = 0
|
||||
|
||||
/obj/item/clothing/under/aviatoruniform
|
||||
name = "aviator uniform"
|
||||
desc = "Now you can look absolutely dashing!"
|
||||
icon_state = "aviator_uniform"
|
||||
item_state = "aviator_uniform"
|
||||
item_color = "aviator_uniform"
|
||||
can_adjust = 0
|
||||
|
||||
/obj/item/clothing/under/bikersuit
|
||||
name = "biker's outfit"
|
||||
icon_state = "biker"
|
||||
item_state = "biker"
|
||||
item_color = "biker"
|
||||
can_adjust = 0
|
||||
|
||||
/obj/item/clothing/under/jacketsuit
|
||||
name = "richard's outfit"
|
||||
desc = "Do you know what time it is?"
|
||||
icon_state = "jacket"
|
||||
item_state = "jacket"
|
||||
item_color = "jacket"
|
||||
can_adjust = 0
|
||||
|
||||
obj/item/clothing/under/mega
|
||||
name = "\improper DRN-001 suit"
|
||||
desc = "The original. Simple, yet very adaptable."
|
||||
icon_state = "mega"
|
||||
item_state = "mega"
|
||||
item_color = "mega"
|
||||
can_adjust = 0
|
||||
|
||||
/obj/item/clothing/under/proto
|
||||
name = "The Prototype Suit"
|
||||
desc = "Even robots know scarves are the perfect accessory for a brooding rival."
|
||||
icon_state = "proto"
|
||||
item_state = "proto"
|
||||
item_color = "proto"
|
||||
can_adjust = 0
|
||||
|
||||
/obj/item/clothing/under/megax
|
||||
name = "\improper Maverick Hunter regalia"
|
||||
desc = "The best outfit for taking out rogue borgs."
|
||||
icon_state = "megax"
|
||||
item_state = "megax"
|
||||
item_color = "megax"
|
||||
can_adjust = 0
|
||||
|
||||
/obj/item/clothing/under/joe
|
||||
name = "The Sniper Suit"
|
||||
desc = "Mass produced combat robots with a rather unfitting name."
|
||||
icon_state = "joe"
|
||||
item_state = "joe"
|
||||
item_color = "joe"
|
||||
can_adjust = 0
|
||||
|
||||
/obj/item/clothing/under/roll
|
||||
name = "\improper DRN-002 Dress"
|
||||
desc = "A simple red dress, the good doctor's second robot wasn't quite as exciting as the first."
|
||||
icon_state = "roll"
|
||||
item_state = "roll"
|
||||
item_color = "roll"
|
||||
can_adjust = 0
|
||||
|
||||
/obj/item/clothing/under/gokugidown
|
||||
name = "turtle hermit undershirt"
|
||||
desc = "Something seems oddly familiar about this outfit..."
|
||||
icon_state = "gokugidown"
|
||||
item_state = "gokugidown"
|
||||
item_color = "gokugidown"
|
||||
can_adjust = 0
|
||||
|
||||
/obj/item/clothing/under/gokugi
|
||||
name = "turtle hermit outfit"
|
||||
desc = "An outfit from one trained by the great Turtle Hermit."
|
||||
icon_state = "gokugi"
|
||||
item_state = "gokugi"
|
||||
item_color = "gokugi"
|
||||
can_adjust = 0
|
||||
|
||||
/obj/item/clothing/under/doomguy
|
||||
name = "\improper Doomguy's pants"
|
||||
desc = ""
|
||||
icon_state = "doom"
|
||||
item_state = "doom"
|
||||
item_color = "doom"
|
||||
can_adjust = 0
|
||||
|
||||
/obj/item/clothing/under/vault13
|
||||
name = "vault 13 Jumpsuit"
|
||||
desc = "Oddly similar to the station's usual jumpsuits, but with a rustic charm to it. Has a large thirteen emblazened on the back."
|
||||
icon_state = "v13-jumpsuit"
|
||||
item_state = "v13-jumpsuit"
|
||||
item_color = "v13-jumpsuit"
|
||||
can_adjust = 0
|
||||
|
||||
/obj/item/clothing/under/vault
|
||||
name = "vault jumpsuit"
|
||||
desc = "Oddly similar to the station's usual jumpsuits, but with a rustic charm to it."
|
||||
icon_state = "v-jumpsuit"
|
||||
item_state = "v-jumpsuit"
|
||||
item_color = "v-jumpsuit"
|
||||
can_adjust = 0
|
||||
|
||||
/obj/item/clothing/under/clownpiece
|
||||
name = "Clownpiece's Pierrot suit"
|
||||
desc = "A female-sized set of leggings and shirt with a pattern similar to the American flag, featuring a frilled collar."
|
||||
icon_state = "clownpiece"
|
||||
item_state = "clownpiece"
|
||||
item_color = "clownpiece"
|
||||
can_adjust = 0
|
||||
|
||||
/obj/item/clothing/under/cia
|
||||
name = "casual IAA outfit"
|
||||
desc = "Just looking at this makes you feel in charge."
|
||||
icon_state = "cia"
|
||||
item_state = "cia"
|
||||
item_color = "cia"
|
||||
can_adjust = 0
|
||||
|
||||
/obj/item/clothing/under/greaser
|
||||
name = "greaser outfit"
|
||||
desc = "The one that you want!"
|
||||
icon_state = "greaser_default"
|
||||
item_state = "greaser_default"
|
||||
can_adjust = 0
|
||||
|
||||
/obj/item/clothing/under/greaser/New()
|
||||
var/greaser_colour = "default"
|
||||
switch(rand(1,4))
|
||||
if(1)
|
||||
greaser_colour = "default"
|
||||
if(2)
|
||||
greaser_colour = "cult"
|
||||
if(3)
|
||||
greaser_colour = "spider"
|
||||
if(4)
|
||||
greaser_colour = "snakes"
|
||||
desc = "Tunnel Snakes Rule!"
|
||||
icon_state = "greaser_[greaser_colour]"
|
||||
item_state = "greaser_[greaser_colour]"
|
||||
item_color = "greaser_[greaser_colour]"
|
||||
can_adjust = 0
|
||||
|
||||
/obj/item/clothing/under/wintercasualwear
|
||||
name = "winter casualwear"
|
||||
desc = "Perfect for winter!"
|
||||
icon_state = "shizunewinter"
|
||||
item_state = "shizunewinter"
|
||||
item_color = "shizunewinter"
|
||||
can_adjust = 0
|
||||
|
||||
|
||||
/obj/item/clothing/under/casualwear
|
||||
name = "spring casualwear"
|
||||
desc = "Perfect for spring!"
|
||||
icon_state = "shizunenormal"
|
||||
item_state = "shizunenormal"
|
||||
item_color = "shizunenormal"
|
||||
can_adjust = 0
|
||||
|
||||
/obj/item/clothing/under/keyholesweater
|
||||
name = "keyhole sweater"
|
||||
desc = "What is the point of this, anyway?"
|
||||
icon_state = "keyholesweater"
|
||||
item_state = "keyholesweater"
|
||||
item_color = "keyholesweater"
|
||||
can_adjust = 0
|
||||
|
||||
/obj/item/clothing/under/casualhoodie
|
||||
name = "casual hoodie"
|
||||
desc = "Pefect for lounging about in."
|
||||
icon_state = "hoodiejeans"
|
||||
item_state = "hoodiejeans"
|
||||
item_color = "hoodiejeans"
|
||||
can_adjust = 0
|
||||
|
||||
|
||||
/obj/item/clothing/under/casualhoodie/skirt
|
||||
icon_state = "hoodieskirt"
|
||||
item_state = "hoodieskirt"
|
||||
item_color = "hoodieskirt"
|
||||
can_adjust = 0
|
||||
|
||||
/obj/item/clothing/under/mummy_rags
|
||||
name = "mummy rags"
|
||||
desc = "Ancient rags taken off from some mummy."
|
||||
icon_state = "mummy"
|
||||
item_state = "mummy"
|
||||
item_color = "mummy"
|
||||
can_adjust = 0
|
||||
has_sensor = 0
|
||||
|
||||
/obj/item/clothing/under/neorussian
|
||||
name = "neo-Russian uniform"
|
||||
desc = "Employs a special toshnit pattern, will render you invisible when you eat a potato on an empty stomach."
|
||||
icon_state = "nr_uniform"
|
||||
item_state = "nr_uniform"
|
||||
item_color = "nr_uniform"
|
||||
can_adjust = 0
|
||||
|
||||
/obj/item/clothing/under/rottensuit
|
||||
name = "rotten suit"
|
||||
desc = "This suit seems perfect for wearing underneath a disguise."
|
||||
icon_state = "rottensuit"
|
||||
item_state = "rottensuit"
|
||||
item_color = "rottensuit"
|
||||
can_adjust = 0
|
||||
|
||||
Reference in New Issue
Block a user