Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 8782f86

Browse filesBrowse files
Amelia0010alexkar598
Amelia0010
authored and
alexkar598
committed
1 parent 9437355 commit 8782f86
Copy full SHA for 8782f86

8 files changed

+36-15Lines changed: 36 additions & 15 deletions

File tree

Expand file treeCollapse file tree
Open diff view settings
Filter options
Expand file treeCollapse file tree
Open diff view settings
Collapse file

‎code/modules/antagonists/blob/blobstrains/cryogenic_poison.dm‎

Copy file name to clipboardExpand all lines: code/modules/antagonists/blob/blobstrains/cryogenic_poison.dm
+3-3Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
/datum/reagent/blob/cryogenic_poison/reaction_mob(mob/living/M, method=TOUCH, reac_volume, show_message, touch_protection, mob/camera/blob/O)
2020
reac_volume = ..()
2121
if(M.reagents)
22-
M.reagents.add_reagent("frostoil", 0.3*reac_volume)
23-
M.reagents.add_reagent("ice", 0.3*reac_volume)
24-
M.reagents.add_reagent("cryogenic_poison", 0.3*reac_volume)
22+
M.reagents.add_reagent(/datum/reagent/consumable/frostoil, 0.3*reac_volume)
23+
M.reagents.add_reagent(/datum/reagent/consumable/ice, 0.3*reac_volume)
24+
M.reagents.add_reagent(/datum/reagent/blob/cryogenic_poison, 0.3*reac_volume)
2525
M.apply_damage(0.2*reac_volume, BRUTE)
2626

2727
/datum/reagent/blob/cryogenic_poison/on_mob_life(mob/living/carbon/M)
Collapse file

‎code/modules/antagonists/blob/blobstrains/regenerative_materia.dm‎

Copy file name to clipboardExpand all lines: code/modules/antagonists/blob/blobstrains/regenerative_materia.dm
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
reac_volume = ..()
1818
M.adjust_drugginess(reac_volume)
1919
if(M.reagents)
20-
M.reagents.add_reagent("regenerative_materia", 0.2*reac_volume)
21-
M.reagents.add_reagent("spore", 0.2*reac_volume)
20+
M.reagents.add_reagent(/datum/reagent/blob/regenerative_materia, 0.2*reac_volume)
21+
M.reagents.add_reagent(/datum/reagent/toxin/spore, 0.2*reac_volume)
2222
M.apply_damage(0.7*reac_volume, TOX)
2323

2424
/datum/reagent/blob/regenerative_materia/on_mob_life(mob/living/carbon/C)
Collapse file

‎yogstation/code/game/gamemodes/vampire/vampire_powers.dm‎

Copy file name to clipboardExpand all lines: yogstation/code/game/gamemodes/vampire/vampire_powers.dm
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@
277277
to_chat(user, "<span class='warning'>[target]'s mind is too strong!</span>")
278278
continue
279279
user.visible_message("<span class='warning'>[user] latches onto [target]'s neck, and a pure dread eminates from them.</span>", "<span class='warning'>You latch onto [target]'s neck, preparing to transfer your unholy blood to them.</span>", "<span class='warning'>A dreadful feeling overcomes you</span>")
280-
target.reagents.add_reagent("salbutamol", 10) //incase you're choking the victim
280+
target.reagents.add_reagent(/datum/reagent/medicine/salbutamol, 10) //incase you're choking the victim
281281
for(var/progress = 0, progress <= 3, progress++)
282282
switch(progress)
283283
if(1)
Collapse file

‎yogstation/code/modules/antagonists/shadowling/shadowling_abilities.dm‎

Copy file name to clipboardExpand all lines: yogstation/code/modules/antagonists/shadowling/shadowling_abilities.dm
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@
205205
if(M.bodytemperature)
206206
M.bodytemperature -= 200 //Extreme amount of initial cold
207207
if(M.reagents)
208-
M.reagents.add_reagent("frostoil", 15) //Half of a cryosting
208+
M.reagents.add_reagent(/datum/reagent/consumable/frostoil, 15) //Half of a cryosting
209209
extinguishMob(M, TRUE)
210210
for(var/obj/item/F in T.contents)
211211
extinguishItem(F, TRUE)
@@ -483,7 +483,7 @@
483483
var/obj/item/reagent_containers/glass/beaker/large/B = new /obj/item/reagent_containers/glass/beaker/large(user.loc) //hacky
484484
B.reagents.clear_reagents() //Just in case!
485485
B.invisibility = INFINITY //This ought to do the trick
486-
B.reagents.add_reagent("blindness_smoke", 10)
486+
B.reagents.add_reagent(/datum/reagent/shadowling_blindness_smoke, 10)
487487
var/datum/effect_system/smoke_spread/chem/S = new
488488
S.attach(B)
489489
if(S)
Collapse file

‎yogstation/code/modules/mob/living/simple_animal/friendly/goats.dm‎

Copy file name to clipboardExpand all lines: yogstation/code/modules/mob/living/simple_animal/friendly/goats.dm
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,8 @@
7777
/mob/living/simple_animal/hostile/retaliate/goat/cottoncandy/attack_hand(mob/living/L)
7878
..()
7979
if(L.a_intent == INTENT_HARM && L.reagents && !stat)
80-
L.reagents.add_reagent("nutriment", 0.4)
81-
L.reagents.add_reagent("vitamin", 0.4)
80+
L.reagents.add_reagent(/datum/reagent/consumable/nutriment, 0.4)
81+
L.reagents.add_reagent(/datum/reagent/consumable/nutriment/vitamin, 0.4)
8282

8383
/mob/living/simple_animal/hostile/retaliate/goat/glowing
8484
name = "Glowing Goat"
Collapse file

‎yogstation/code/modules/mob/living/simple_animal/hostile/floor_cluwne.dm‎

Copy file name to clipboardExpand all lines: yogstation/code/modules/mob/living/simple_animal/hostile/floor_cluwne.dm
+3-3Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -316,9 +316,9 @@ GLOBAL_VAR_INIT(floor_cluwnes, 0)
316316
to_chat(H, "<span class='userdanger'>WHAT THE FUCK IS THAT?!</span>")
317317
to_chat(H, "<i>.KNOH !nuf hcum os si uoy htiw gniyalP .KNOH KNOH KNOH</i>")
318318
H.playsound_local(src,'sound/hallucinations/im_here1.ogg', 25)
319-
H.reagents.add_reagent("mindbreaker", 3)
320-
H.reagents.add_reagent("laughter", 5)
321-
H.reagents.add_reagent("mercury", 3)
319+
H.reagents.add_reagent(/datum/reagent/toxin/mindbreaker, 3)
320+
H.reagents.add_reagent(/datum/reagent/consumable/laughter, 5)
321+
H.reagents.add_reagent(/datum/reagent/mercury, 3)
322322
Appear()
323323
manifested = FALSE
324324
addtimer(CALLBACK(src, /mob/living/simple_animal/hostile/floor_cluwne/.proc/Manifest), 2)
Collapse file

‎yogstation/code/modules/reagents/chemistry/reagents/other_reagents.dm‎

Copy file name to clipboardExpand all lines: yogstation/code/modules/reagents/chemistry/reagents/other_reagents.dm
+22-1Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,25 @@
1414

1515
/datum/reagent/cluwnification/reaction_mob(mob/living/L, method=TOUCH, reac_volume, show_message = 1, touch_protection = 0)
1616
if(method==PATCH || method==INGEST || method==INJECT || (method == VAPOR && prob(min(reac_volume,100)*(1 - touch_protection))))
17-
L.ForceContractDisease(new /datum/disease/cluwnification(), FALSE, TRUE)
17+
L.ForceContractDisease(new /datum/disease/cluwnification(), FALSE, TRUE)
18+
19+
/datum/reagent/shadowling_blindness_smoke
20+
name = "odd black liquid"
21+
description = "<::ERROR::> CANNOT ANALYZE REAGENT <::ERROR::>"
22+
color = "#000000" //Complete black (RGB: 0, 0, 0)
23+
metabolization_rate = 100 //lel
24+
25+
/datum/reagent/shadowling_blindness_smoke/on_mob_life(mob/living/M)
26+
if(!is_shadow_or_thrall(M))
27+
to_chat(M, "<span class='warning'><b>You breathe in the black smoke, and your eyes burn horribly!</b></span>")
28+
M.blind_eyes(5)
29+
if(prob(25))
30+
M.visible_message("<b>[M]</b> claws at their eyes!")
31+
M.Stun(3, 0)
32+
. = 1
33+
else
34+
to_chat(M, "<span class='notice'><b>You breathe in the black smoke, and you feel revitalized!</b></span>")
35+
M.adjustOxyLoss(-2, 0)
36+
M.adjustToxLoss(-2, 0)
37+
. = 1
38+
return ..() || .
Collapse file

‎yogstation/code/modules/research/experimentor.dm‎

Copy file name to clipboardExpand all lines: yogstation/code/modules/research/experimentor.dm
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@
181181
visible_message("<span class='danger'>[src] malfunctions, shattering [exp_on] and releasing a dangerous cloud of coolant!</span>")
182182
var/datum/reagents/R = new/datum/reagents(50)
183183
R.my_atom = src
184-
R.add_reagent("frostoil" , 50)
184+
R.add_reagent(/datum/reagent/consumable/frostoil, 50)
185185
investigate_log("Experimentor has released frostoil gas.", INVESTIGATE_EXPERIMENTOR)
186186
var/datum/effect_system/smoke_spread/chem/smoke = new
187187
smoke.set_up(R, 0, src, silent = TRUE)

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.