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

Game folder

Browse Source
This commit is contained in:
Poojawa
2018-09-11 04:06:45 -05:00
parent b6430559e9
commit 8b9ef1e400
270 changed files with 3120 additions and 2523 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/effects/decals/cleanable.dm
+1 -6
View File
@@ -5,7 +5,6 @@
var/blood_state = "" //I'm sorry but cleanable/blood code is ass, and so is blood_DNA
var/bloodiness = 0 //0-100, amount of blood in this decal, used for making footprints and affecting the alpha of bloody footprints
var/mergeable_decal = TRUE //when two of these are on a same tile or do we need to merge them into just one?
var/beauty
/obj/effect/decal/cleanable/Initialize(mapload, list/datum/disease/diseases)
. = ..()
@@ -26,10 +25,6 @@
if(LAZYLEN(diseases_to_add))
AddComponent(/datum/component/infective, diseases_to_add)
/obj/effect/decal/cleanable/ComponentInitialize()
. = ..()
addtimer(CALLBACK(src, /datum.proc/AddComponent, /datum/component/beauty, beauty), 0) //inb4 i get yelled at for using the beauty var on cleanable instead of calling this proc on every subtype which would be pedantic and actually run worse.
/obj/effect/decal/cleanable/proc/replace_decal(obj/effect/decal/cleanable/C) // Returns true if we should give up in favor of the pre-existing decal
if(mergeable_decal)
return TRUE
@@ -77,7 +72,7 @@
..()
if(ishuman(O))
var/mob/living/carbon/human/H = O
if(H.shoes && blood_state && bloodiness)
if(H.shoes && blood_state && bloodiness && !H.has_trait(TRAIT_LIGHT_STEP))
var/obj/item/clothing/shoes/S = H.shoes
var/add_blood = 0
if(bloodiness >= BLOOD_GAIN_PER_STEP)
code/game/objects/effects/decals/cleanable/aliens.dm
+1 -2
View File
@@ -6,9 +6,8 @@
icon = 'icons/effects/blood.dmi'
icon_state = "xfloor1"
random_icon_states = list("xfloor1", "xfloor2", "xfloor3", "xfloor4", "xfloor5", "xfloor6", "xfloor7")
bloodiness = MAX_SHOE_BLOODINESS
bloodiness = BLOOD_AMOUNT_PER_DECAL
blood_state = BLOOD_STATE_XENO
beauty = -75
/obj/effect/decal/cleanable/xenoblood/Initialize()
. = ..()
code/game/objects/effects/decals/cleanable/humans.dm
+9 -2
View File
@@ -5,11 +5,13 @@
icon_state = "floor1"
random_icon_states = list("floor1", "floor2", "floor3", "floor4", "floor5", "floor6", "floor7")
blood_state = BLOOD_STATE_HUMAN
bloodiness = MAX_SHOE_BLOODINESS
beauty = -60
bloodiness = BLOOD_AMOUNT_PER_DECAL
/obj/effect/decal/cleanable/blood/replace_decal(obj/effect/decal/cleanable/blood/C)
C.add_blood_DNA(return_blood_DNA())
if (bloodiness)
if (C.bloodiness < MAX_SHOE_BLOODINESS)
C.bloodiness += bloodiness
return ..()
/obj/effect/decal/cleanable/blood/old
@@ -56,6 +58,11 @@
/obj/effect/decal/cleanable/blood/gibs/ex_act(severity, target)
return
/obj/effect/decal/cleanable/blood/gibs/Crossed(mob/living/L)
if(istype(L) && has_gravity(loc))
playsound(loc, 'sound/effects/gib_step.ogg', L.has_trait(TRAIT_LIGHT_STEP) ? 20 : 50, 1)
. = ..()
/obj/effect/decal/cleanable/blood/gibs/proc/streak(list/directions)
set waitfor = 0
var/direction = pick(directions)
code/game/objects/effects/decals/cleanable/misc.dm
+16 -21
View File
@@ -3,7 +3,6 @@
desc = "Someone should clean that up."
icon = 'icons/obj/objects.dmi'
icon_state = "shards"
beauty = -50
/obj/effect/decal/cleanable/ash
name = "ashes"
@@ -11,7 +10,6 @@
icon = 'icons/obj/objects.dmi'
icon_state = "ash"
mergeable_decal = FALSE
beauty = -50
/obj/effect/decal/cleanable/ash/Initialize()
. = ..()
@@ -26,7 +24,6 @@
/obj/effect/decal/cleanable/ash/large
name = "large pile of ashes"
icon_state = "big_ash"
beauty = -100
/obj/effect/decal/cleanable/ash/large/Initialize()
. = ..()
@@ -37,7 +34,6 @@
desc = "Back to sand."
icon = 'icons/obj/shards.dmi'
icon_state = "tiny"
beauty = -60
/obj/effect/decal/cleanable/glass/Initialize()
. = ..()
@@ -50,21 +46,34 @@
name = "dirt"
desc = "Someone should clean that up."
icon_state = "dirt"
canSmoothWith = list(/obj/effect/decal/cleanable/dirt, /turf/closed/wall, /obj/structure/falsewall)
smooth = SMOOTH_FALSE
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
beauty = -50
/obj/effect/decal/cleanable/dirt/Initialize()
. = ..()
var/turf/T = get_turf(src)
if(T.tiled_dirt)
smooth = SMOOTH_MORE
icon = 'icons/effects/dirt.dmi'
icon_state = ""
queue_smooth(src)
queue_smooth_neighbors(src)
/obj/effect/decal/cleanable/dirt/Destroy()
queue_smooth_neighbors(src)
return ..()
/obj/effect/decal/cleanable/flour
name = "flour"
desc = "It's still good. Four second rule!"
icon_state = "flour"
beauty = -50
/obj/effect/decal/cleanable/greenglow
name = "glowing goo"
desc = "Jeez. I hope that's not for lunch."
light_color = LIGHT_COLOR_GREEN
icon_state = "greenglow"
beauty = -150
/obj/effect/decal/cleanable/greenglow/Initialize(mapload)
. = ..()
@@ -80,7 +89,6 @@
layer = WALL_OBJ_LAYER
icon_state = "cobweb1"
resistance_flags = FLAMMABLE
beauty = -50
/obj/effect/decal/cleanable/cobweb/cobweb2
icon_state = "cobweb2"
@@ -92,12 +100,10 @@
icon = 'icons/effects/effects.dmi'
icon_state = "molten"
mergeable_decal = FALSE
beauty = -100
/obj/effect/decal/cleanable/molten_object/large
name = "big gooey grey mass"
icon_state = "big_molten"
beauty = -250
//Vomit (sorry)
/obj/effect/decal/cleanable/vomit
@@ -106,7 +112,6 @@
icon = 'icons/effects/blood.dmi'
icon_state = "vomit_1"
random_icon_states = list("vomit_1", "vomit_2", "vomit_3", "vomit_4")
beauty = -200
/obj/effect/decal/cleanable/vomit/attack_hand(mob/user)
. = ..()
@@ -141,14 +146,12 @@
gender = NEUTER
icon = 'icons/effects/tomatodecal.dmi'
random_icon_states = list("tomato_floor1", "tomato_floor2", "tomato_floor3")
beauty = -50
/obj/effect/decal/cleanable/plant_smudge
name = "plant smudge"
gender = NEUTER
icon = 'icons/effects/tomatodecal.dmi'
random_icon_states = list("smashed_plant")
beauty = -50
/obj/effect/decal/cleanable/egg_smudge
name = "smashed egg"
@@ -156,7 +159,6 @@
gender = NEUTER
icon = 'icons/effects/tomatodecal.dmi'
random_icon_states = list("smashed_egg1", "smashed_egg2", "smashed_egg3")
beauty = -50
/obj/effect/decal/cleanable/pie_smudge //honk
name = "smashed pie"
@@ -164,7 +166,6 @@
gender = NEUTER
icon = 'icons/effects/tomatodecal.dmi'
random_icon_states = list("smashed_pie")
beauty = -50
/obj/effect/decal/cleanable/chem_pile
name = "chemical pile"
@@ -172,7 +173,6 @@
gender = NEUTER
icon = 'icons/obj/objects.dmi'
icon_state = "ash"
beauty = -60
/obj/effect/decal/cleanable/shreds
name = "shreds"
@@ -180,7 +180,6 @@
icon_state = "shreds"
gender = PLURAL
mergeable_decal = FALSE
beauty = -75
/obj/effect/decal/cleanable/shreds/ex_act(severity, target)
if(severity == 1) //so shreds created during an explosion aren't deleted by the explosion.
@@ -197,14 +196,12 @@
icon = 'icons/effects/tomatodecal.dmi'
icon_state = "salt_pile"
gender = NEUTER
beauty = -50
/obj/effect/decal/cleanable/glitter
name = "generic glitter pile"
desc = "The herpes of arts and crafts."
icon = 'icons/effects/tile_effects.dmi'
gender = NEUTER
beauty = 100
/obj/effect/decal/cleanable/glitter/pink
name = "pink glitter"
@@ -223,7 +220,6 @@
desc = "A puddle of stabilized plasma."
icon_state = "flour"
color = "#C8A5DC"
beauty = -200
/obj/effect/decal/cleanable/insectguts
name = "insect guts"
@@ -231,4 +227,3 @@
icon = 'icons/effects/blood.dmi'
icon_state = "xfloor1"
random_icon_states = list("xfloor1", "xfloor2", "xfloor3", "xfloor4", "xfloor5", "xfloor6", "xfloor7")
beauty = -300
code/game/objects/effects/decals/cleanable/robots.dm
+2 -4
View File
@@ -8,9 +8,8 @@
layer = LOW_OBJ_LAYER
random_icon_states = list("gib1", "gib2", "gib3", "gib4", "gib5", "gib6", "gib7")
blood_state = BLOOD_STATE_OIL
bloodiness = MAX_SHOE_BLOODINESS
bloodiness = BLOOD_AMOUNT_PER_DECAL
mergeable_decal = FALSE
beauty = -100
/obj/effect/decal/cleanable/robot_debris/proc/streak(list/directions)
set waitfor = 0
@@ -46,8 +45,7 @@
icon_state = "floor1"
random_icon_states = list("floor1", "floor2", "floor3", "floor4", "floor5", "floor6", "floor7")
blood_state = BLOOD_STATE_OIL
bloodiness = MAX_SHOE_BLOODINESS
beauty = -150
bloodiness = BLOOD_AMOUNT_PER_DECAL
/obj/effect/decal/cleanable/oil/Initialize()
. = ..()
code/game/objects/effects/decals/decal.dm
+1 -1
View File
@@ -45,4 +45,4 @@
var/turf/T = loc
if(!istype(T)) //you know this will happen somehow
CRASH("Turf decal initialized in an object/nullspace")
T.AddComponent(/datum/component/decal, icon, icon_state, dir, CLEAN_GOD, color)
T.AddComponent(/datum/component/decal, icon, icon_state, dir, CLEAN_GOD, color, null, null, alpha)
code/game/objects/effects/decals/turfdecal/tilecoloring.dm
+22 -195
View File
@@ -1,212 +1,39 @@
/obj/effect/turf_decal/tile
name = "tile decal"
icon_state = "corner_white_full"
icon_state = "tile_corner"
layer = TURF_PLATING_DECAL_LAYER
/obj/effect/turf_decal/tile/black
name = "black tile decal"
color = COLOR_ALMOST_BLACK
/obj/effect/turf_decal/tile/black/diagonal
icon_state = "corner_white_diagonal"
/obj/effect/turf_decal/tile/black/side
icon_state = "corner_white_side"
/obj/effect/turf_decal/tile/black/corner
icon_state = "corner_white"
alpha = 110
/obj/effect/turf_decal/tile/blue
name = "blue tile decal"
color = COLOR_BLUE_GRAY
/obj/effect/turf_decal/tile/blue/diagonal
icon_state = "corner_white_diagonal"
/obj/effect/turf_decal/tile/blue/side
icon_state = "corner_white_side"
/obj/effect/turf_decal/tile/blue/corner
icon_state = "corner_white"
/obj/effect/turf_decal/tile/paleblue
name = "pale blue tile decal"
color = COLOR_PALE_BLUE_GRAY
/obj/effect/turf_decal/tile/paleblue/diagonal
icon_state = "corner_white_diagonal"
/obj/effect/turf_decal/tile/paleblue/side
icon_state = "corner_white_side"
/obj/effect/turf_decal/tile/paleblue/corner
icon_state = "corner_white"
name = "blue corner"
color = "#52B4E9"
/obj/effect/turf_decal/tile/green
name = "green tile decal"
color = COLOR_GREEN_GRAY
/obj/effect/turf_decal/tile/green/diagonal
icon_state = "corner_white_diagonal"
/obj/effect/turf_decal/tile/green/side
icon_state = "corner_white_side"
/obj/effect/turf_decal/tile/green/corner
icon_state = "corner_white"
/obj/effect/turf_decal/tile/lime
name = "lime tile decal"
color = COLOR_PALE_GREEN_GRAY
/obj/effect/turf_decal/tile/lime/diagonal
icon_state = "corner_white_diagonal"
/obj/effect/turf_decal/tile/lime/side
icon_state = "corner_white_side"
/obj/effect/turf_decal/tile/lime/corner
icon_state = "corner_white"
name = "green corner"
color = "#9FED58"
/obj/effect/turf_decal/tile/yellow
name = "yellow tile decal"
color = COLOR_BROWN
/obj/effect/turf_decal/tile/yellow/diagonal
icon_state = "corner_white_diagonal"
/obj/effect/turf_decal/tile/yellow/side
icon_state = "corner_white_side"
/obj/effect/turf_decal/tile/yellow/corner
icon_state = "corner_white"
/obj/effect/turf_decal/tile/beige
name = "beige tile decal"
color = COLOR_BEIGE
/obj/effect/turf_decal/tile/beige/diagonal
icon_state = "corner_white_diagonal"
/obj/effect/turf_decal/tile/beige/side
icon_state = "corner_white_side"
/obj/effect/turf_decal/tile/beige/corner
icon_state = "corner_white"
name = "yellow corner"
color = "#EFB341"
/obj/effect/turf_decal/tile/red
name = "red tile decal"
color = COLOR_RED_GRAY
/obj/effect/turf_decal/tile/red/diagonal
icon_state = "corner_white_diagonal"
/obj/effect/turf_decal/tile/red/side
icon_state = "corner_white_side"
/obj/effect/turf_decal/tile/red/corner
icon_state = "corner_white"
/obj/effect/turf_decal/tile/pink
name = "pink tile decal"
color = COLOR_PALE_RED_GRAY
/obj/effect/turf_decal/tile/pink/diagonal
icon_state = "corner_white_diagonal"
/obj/effect/turf_decal/tile/pink/side
icon_state = "corner_white_side"
/obj/effect/turf_decal/tile/pink/corner
icon_state = "corner_white"
name = "red corner"
color = "#DE3A3A"
/obj/effect/turf_decal/tile/bar
name = "bar corner"
color = "#791500"
alpha = 130
/obj/effect/turf_decal/tile/purple
name = "purple tile decal"
color = COLOR_PURPLE_GRAY
/obj/effect/turf_decal/tile/purple/diagonal
icon_state = "corner_white_diagonal"
/obj/effect/turf_decal/tile/purple/side
icon_state = "corner_white_side"
/obj/effect/turf_decal/tile/purple/corner
icon_state = "corner_white"
/obj/effect/turf_decal/tile/mauve
name = "mauve tile decal"
color = COLOR_PALE_PURPLE_GRAY
/obj/effect/turf_decal/tile/mauve/diagonal
icon_state = "corner_white_diagonal"
/obj/effect/turf_decal/tile/mauve/side
icon_state = "corner_white_side"
/obj/effect/turf_decal/tile/mauve/corner
icon_state = "corner_white"
/obj/effect/turf_decal/tile/orange
name = "orange tile decal"
color = COLOR_DARK_ORANGE
/obj/effect/turf_decal/tile/orange/diagonal
icon_state = "corner_white_diagonal"
/obj/effect/turf_decal/tile/orange/side
icon_state = "corner_white_side"
/obj/effect/turf_decal/tile/orange/corner
icon_state = "corner_white"
name = "purple corner"
color = "#D381C9"
/obj/effect/turf_decal/tile/brown
name = "brown tile decal"
color = COLOR_DARK_BROWN
name = "brown corner"
color = "#A46106"
/obj/effect/turf_decal/tile/brown/diagonal
icon_state = "corner_white_diagonal"
/obj/effect/turf_decal/tile/brown/side
icon_state = "corner_white_side"
/obj/effect/turf_decal/tile/brown/corner
icon_state = "corner_white"
/obj/effect/turf_decal/tile/white
name = "white tile decal"
/obj/effect/turf_decal/tile/white/diagonal
icon_state = "corner_white_diagonal"
/obj/effect/turf_decal/tile/white/side
icon_state = "corner_white_side"
/obj/effect/turf_decal/tile/white/corner
icon_state = "corner_white"
/obj/effect/turf_decal/tile/gray
name = "gray tile decal"
color = COLOR_FLOORTILE_GRAY
/obj/effect/turf_decal/tile/gray/diagonal
icon_state = "corner_white_diagonal"
/obj/effect/turf_decal/tile/gray/side
icon_state = "corner_white_side"
/obj/effect/turf_decal/tile/gray/corner
icon_state = "corner_white"
/obj/effect/turf_decal/tile/neutral
name = "neutral corner"
color = "#D4D4D4"
alpha = 50