mirror of
https://github.com/vgstation-coders/vgstation13.git
synced 2025-12-10 10:21:11 +00:00
c9d1e3452f
Chemistry:
I added a new variable to each reagent called "color". It's a hexadecimal string used to give a reagent a unique color for use in future shenanigans that are in development atm. Updooted the Chemistry-Readme.dm file to include some other variables I included into the recipie system as well as this new color variable. Implementing these colors is still an ongoing effort, and yes you will be able to "blend" these colors.
Viruses:
Nothing has been CHANGED (yet) but there is some framework for a new virus system to work alongside our current one, special thanks to Googolplexed of Baystation 12! If this weren't tied to some other things I changed, I wouldn't be committing this in the first place. While experimental, you shouldn't even notice this exists.
!!BUGFIXES!!:
Wow, there's so many I'm having a hard time keeping track of it all!
A bunch of runtime errors were hopefully fixed. There were some problems with slicing stuff spitting out runtime errors because an istype() was missing. The same goes for ritual tomes and some other things. Medical cyborgs were also fixed: their pills will now recharge properly and stop spitting out atrocious runtime errors.
It was intended for it to be possible to shoot people on top of Mulebots, but a runtime error always cut the proc off before it could execute. This has been fixed.
There are probably some other things I'm missing, but all in all, that's about it for the bugfixes.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1905 316c924e-a436-60f5-8080-3fe189b3f50e
277 lines
7.0 KiB
Plaintext
277 lines
7.0 KiB
Plaintext
/obj/decal/ash
|
|
name = "Ashes"
|
|
desc = "Ashes to ashes, dust to dust, and into space."
|
|
icon = 'objects.dmi'
|
|
icon_state = "ash"
|
|
anchored = 1
|
|
|
|
/obj/decal/remains/human
|
|
name = "remains"
|
|
desc = "These remains have a strange sense about them..."
|
|
icon = 'blood.dmi'
|
|
icon_state = "remains"
|
|
anchored = 1
|
|
|
|
/obj/decal/remains/xeno
|
|
name = "remains"
|
|
desc = "These remains have a strange sense about them..."
|
|
icon = 'blood.dmi'
|
|
icon_state = "remainsxeno"
|
|
anchored = 1
|
|
|
|
/obj/decal/remains/robot
|
|
name = "remains"
|
|
desc = "These remains have a strange sense about them..."
|
|
icon = 'robots.dmi'
|
|
icon_state = "remainsrobot"
|
|
anchored = 1
|
|
|
|
/obj/decal/point
|
|
name = "point"
|
|
desc = "It is an arrow hanging in mid-air. There may be a wizard about."
|
|
icon = 'screen1.dmi'
|
|
icon_state = "arrow"
|
|
layer = 16.0
|
|
anchored = 1
|
|
|
|
/obj/decal/cleanable
|
|
var/list/random_icon_states = list()
|
|
|
|
//HUMANS
|
|
|
|
/obj/decal/cleanable/blood
|
|
name = "Blood"
|
|
desc = "It's red. Its Gooye. It is the chefs cooking perhaps."
|
|
density = 0
|
|
anchored = 1
|
|
layer = 2
|
|
icon = 'blood.dmi'
|
|
icon_state = "floor1"
|
|
random_icon_states = list("floor1", "floor2", "floor3", "floor4", "floor5", "floor6", "floor7")
|
|
var/list/viruses = list()
|
|
blood_DNA = null
|
|
blood_type = null
|
|
var/datum/disease2/disease/virus2 = null
|
|
|
|
Del()
|
|
for(var/datum/disease/D in viruses)
|
|
D.cure(0)
|
|
..()
|
|
|
|
/obj/decal/cleanable/blood/splatter
|
|
random_icon_states = list("gibbl1", "gibbl2", "gibbl3", "gibbl4", "gibbl5")
|
|
|
|
/obj/decal/cleanable/blood/tracks
|
|
icon_state = "tracks"
|
|
random_icon_states = null
|
|
|
|
/obj/decal/cleanable/blood/gibs
|
|
name = "gibs"
|
|
desc = "Grisly...and not the good kind neither."
|
|
density = 0
|
|
anchored = 0
|
|
layer = 2
|
|
icon = 'blood.dmi'
|
|
icon_state = "gibbl5"
|
|
random_icon_states = list("gib1", "gib2", "gib3", "gib4", "gib5", "gib6")
|
|
|
|
/obj/decal/cleanable/blood/gibs/up
|
|
random_icon_states = list("gib1", "gib2", "gib3", "gib4", "gib5", "gib6","gibup1","gibup1","gibup1")
|
|
|
|
/obj/decal/cleanable/blood/gibs/down
|
|
random_icon_states = list("gib1", "gib2", "gib3", "gib4", "gib5", "gib6","gibdown1","gibdown1","gibdown1")
|
|
|
|
/obj/decal/cleanable/blood/gibs/body
|
|
random_icon_states = list("gibhead", "gibtorso")
|
|
|
|
/obj/decal/cleanable/blood/gibs/limb
|
|
random_icon_states = list("gibleg", "gibarm")
|
|
|
|
/obj/decal/cleanable/blood/gibs/core
|
|
random_icon_states = list("gibmid1", "gibmid2", "gibmid3")
|
|
|
|
//ALIENS
|
|
|
|
/obj/decal/cleanable/xenoblood
|
|
name = "xeno blood"
|
|
desc = "It's green. Must be more of the chefs cooking."
|
|
density = 0
|
|
anchored = 1
|
|
layer = 2
|
|
icon = 'blood.dmi'
|
|
icon_state = "xfloor1"
|
|
random_icon_states = list("xfloor1", "xfloor2", "xfloor3", "xfloor4", "xfloor5", "xfloor6", "xfloor7")
|
|
var/list/viruses = list()
|
|
|
|
Del()
|
|
for(var/datum/disease/D in viruses)
|
|
D.cure(0)
|
|
..()
|
|
|
|
/obj/decal/cleanable/xenoblood/xsplatter
|
|
random_icon_states = list("xgibbl1", "xgibbl2", "xgibbl3", "xgibbl4", "xgibbl5")
|
|
|
|
/obj/decal/cleanable/xenoblood/xgibs
|
|
name = "xeno gibs"
|
|
desc = "Gnarly..."
|
|
icon = 'blood.dmi'
|
|
icon_state = "xgib1"
|
|
random_icon_states = list("xgib1", "xgib2", "xgib3", "xgib4", "xgib5", "xgib6")
|
|
|
|
/obj/decal/cleanable/xenoblood/xgibs/up
|
|
random_icon_states = list("xgib1", "xgib2", "xgib3", "xgib4", "xgib5", "xgib6","xgibup1","xgibup1","xgibup1")
|
|
|
|
/obj/decal/cleanable/xenoblood/xgibs/down
|
|
random_icon_states = list("xgib1", "xgib2", "xgib3", "xgib4", "xgib5", "xgib6","xgibdown1","xgibdown1","xgibdown1")
|
|
|
|
/obj/decal/cleanable/xenoblood/xgibs/body
|
|
random_icon_states = list("xgibhead", "xgibtorso")
|
|
|
|
/obj/decal/cleanable/xenoblood/xgibs/limb
|
|
random_icon_states = list("xgibleg", "xgibarm")
|
|
|
|
/obj/decal/cleanable/xenoblood/xgibs/core
|
|
random_icon_states = list("xgibmid1", "xgibmid2", "xgibmid3")
|
|
|
|
/obj/decal/cleanable/blood/xtracks
|
|
icon_state = "xtracks"
|
|
random_icon_states = null
|
|
|
|
//ROBOTS
|
|
|
|
/obj/decal/cleanable/robot_debris
|
|
name = "robot debris"
|
|
desc = "Useless heap of junk...or is it..."
|
|
density = 0
|
|
anchored = 0
|
|
layer = 2
|
|
icon = 'robots.dmi'
|
|
icon_state = "gib1"
|
|
random_icon_states = list("gib1", "gib2", "gib3", "gib4", "gib5", "gib6", "gib7")
|
|
|
|
/obj/decal/cleanable/robot_debris/limb
|
|
random_icon_states = list("gibarm", "gibleg")
|
|
|
|
/obj/decal/cleanable/robot_debris/up
|
|
random_icon_states = list("gib1", "gib2", "gib3", "gib4", "gib5", "gib6", "gib7","gibup1","gibup1") //2:7 is close enough to 1:4
|
|
|
|
/obj/decal/cleanable/robot_debris/down
|
|
random_icon_states = list("gib1", "gib2", "gib3", "gib4", "gib5", "gib6", "gib7","gibdown1","gibdown1") //2:7 is close enough to 1:4
|
|
|
|
/obj/decal/cleanable/oil
|
|
name = "motor oil"
|
|
desc = "It's black. Beepsky made another mess."
|
|
density = 0
|
|
anchored = 1
|
|
layer = 2
|
|
icon = 'robots.dmi'
|
|
icon_state = "floor1"
|
|
var/viruses = list()
|
|
random_icon_states = list("floor1", "floor2", "floor3", "floor4", "floor5", "floor6", "floor7")
|
|
|
|
Del()
|
|
for(var/datum/disease/D in viruses)
|
|
D.cure(0)
|
|
..()
|
|
|
|
/obj/decal/cleanable/oil/streak
|
|
random_icon_states = list("streak1", "streak2", "streak3", "streak4", "streak5")
|
|
|
|
//OTHER
|
|
|
|
/obj/decal/cleanable/generic
|
|
name = "clutter"
|
|
desc = "Someone should clean that up."
|
|
density = 0
|
|
anchored = 1
|
|
layer = 2
|
|
icon = 'objects.dmi'
|
|
icon_state = "shards"
|
|
|
|
/obj/decal/cleanable/dirt
|
|
name = "dirt"
|
|
desc = "Someone should clean that up."
|
|
density = 0
|
|
anchored = 1
|
|
layer = 2
|
|
icon = 'effects.dmi'
|
|
icon_state = "dirt"
|
|
|
|
/obj/decal/cleanable/greenglow
|
|
name = "green glow"
|
|
desc = "Eerie. This makes you feel creepy."
|
|
density = 0
|
|
anchored = 1
|
|
layer = 2
|
|
icon = 'effects.dmi'
|
|
icon_state = "greenglow"
|
|
|
|
/obj/decal/cleanable/cobweb
|
|
name = "cobweb"
|
|
desc = "Someone should remove that."
|
|
density = 0
|
|
anchored = 1
|
|
layer = 3
|
|
icon = 'effects.dmi'
|
|
icon_state = "cobweb1"
|
|
|
|
/obj/decal/cleanable/molten_item
|
|
name = "gooey grey mass"
|
|
desc = "Huh. Creepy..."
|
|
density = 0
|
|
anchored = 1
|
|
layer = 3
|
|
icon = 'chemical.dmi'
|
|
icon_state = "molten"
|
|
|
|
/obj/decal/cleanable/cobweb2
|
|
name = "cobweb"
|
|
desc = "Someone should remove that."
|
|
density = 0
|
|
anchored = 1
|
|
layer = 3
|
|
icon = 'effects.dmi'
|
|
icon_state = "cobweb2"
|
|
|
|
// Used for spray that you spray at walls, tables, hydrovats etc
|
|
/obj/decal/spraystill
|
|
density = 0
|
|
anchored = 1
|
|
layer = 50
|
|
|
|
//Vomit (sorry)
|
|
/obj/decal/cleanable/vomit
|
|
name = "Vomit"
|
|
desc = "Gosh, how unpleasant."
|
|
density = 0
|
|
anchored = 1
|
|
layer = 2
|
|
icon = 'blood.dmi'
|
|
icon_state = "vomit_1"
|
|
random_icon_states = list("vomit_1", "vomit_2", "vomit_3", "vomit_4")
|
|
var/list/viruses = list()
|
|
|
|
Del()
|
|
for(var/datum/disease/D in viruses)
|
|
D.cure(0)
|
|
..()
|
|
|
|
/obj/decal/cleanable/tomato_smudge
|
|
name = "Tomato smooth"
|
|
desc = "It's red"
|
|
density = 0
|
|
anchored = 1
|
|
layer = 2
|
|
icon = 'tomatodecal.dmi'
|
|
random_icon_states = list("tomato_floor1", "tomato_floor2", "tomato_floor3")
|
|
|
|
/obj/decal/cleanable/egg_smudge
|
|
name = "Smashed egg"
|
|
desc = ""
|
|
density = 0
|
|
anchored = 1
|
|
layer = 2
|
|
icon = 'tomatodecal.dmi'
|
|
random_icon_states = list("smashed_egg1", "smashed_egg2", "smashed_egg3")
|
|
|