Skip to content

Commit a80404d

Browse files
committed
tweaks
1 parent 42b901e commit a80404d

File tree

3 files changed

+8
-6
lines changed

3 files changed

+8
-6
lines changed

code/game/objects/effects/decals/cleanable/humans.dm

+2
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
/// When dried, this becomes the desc of the blood
2626
var/dry_desc = "Looks like it's been here a while. Eew."
2727

28+
var/base_color
2829
/// How long it takes to dry out
2930
var/drying_time = 5 MINUTES
3031
/// The process to drying out, recorded in deciseconds
@@ -65,6 +66,7 @@
6566
. = ..()
6667
// get a default color based on DNA if it ends up unset somehow
6768
color ||= (GET_ATOM_BLOOD_DNA_LENGTH(src) ? get_blood_dna_color() : COLOR_BLOOD)
69+
base_color = color
6870
// stop existing drying animations
6971
animate(src)
7072
// ok let's make the dry color now

monkestation/code/modules/bloody_cult/cult/buildings/forge.dm

+5-5
Original file line numberDiff line numberDiff line change
@@ -156,10 +156,10 @@
156156
overlays += I_base
157157
overlays += I_lave
158158

159-
/obj/structure/cult/forge/attackby(var/obj/item/I, var/mob/user)
159+
/obj/structure/cult/forge/attackby(obj/item/I, mob/user)
160160
if(istype(I, /obj/item/clothing/mask/cigarette))
161-
var/obj/item/clothing/mask/cigarette/fag = I
162-
fag.light(span_notice("\The [user] lights \the [fag] by bringing its tip close to \the [src]'s molten flow.") )
161+
var/obj/item/clothing/mask/cigarette/cig = I
162+
cig.light(span_notice("\The [user] lights \the [cig] by bringing its tip close to \the [src]'s molten flow.") )
163163
return 1
164164
if(istype(I, /obj/item/candle))
165165
var/obj/item/candle/stick = I
@@ -184,7 +184,7 @@
184184
progbar.plane = HUD_PLANE
185185
progbar.icon_state = "prog_bar_[round((100 - min(1, timeleft / timetotal) * 100), 10)]"
186186

187-
/obj/structure/cult/forge/cultist_act(var/mob/user, var/menu = "default")
187+
/obj/structure/cult/forge/cultist_act(mob/user, menu = "default")
188188
. = ..()
189189
if (!.)
190190
return
@@ -247,7 +247,7 @@
247247
pixel_y = -16 * 1
248248
plane = GAME_PLANE
249249

250-
/obj/effect/cult_ritual/forge/New(var/turf/loc, var/i_forge = "")
250+
/obj/effect/cult_ritual/forge/New(turf/loc, i_forge = "")
251251
..()
252252
icon_state = i_forge
253253
var/image/I = image('monkestation/code/modules/bloody_cult/icons/cult_64x64.dmi', "[i_forge]-mask")

monkestation/code/modules/bloody_cult/cult/spells/blood_doodle.dm

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
to_chat(span_cultbold("There is no blood to draw with here!"))
3838
return
3939

40-
var/blood_color = blood.color
40+
var/blood_color = blood.base_color
4141

4242
var/maximum_length = 30
4343
var/message = stripped_input(owner, "Write a message. You will be able to preview it.", "Bloody writings", "")

0 commit comments

Comments
 (0)