Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

Commit 1c08cbb

Browse files
committed
fix
1 parent b791b14 commit 1c08cbb

File tree

2 files changed

+1
-39
lines changed
  • code
    • datums/mapgen/dungeon_generators/maintenance_generator/maintenance_room_themes
    • modules/reagents/chemistry/reagents

2 files changed

+1
-39
lines changed

code/datums/mapgen/dungeon_generators/maintenance_generator/maintenance_room_themes/random.dm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -391,7 +391,7 @@
391391
. = ..()
392392
for(var/i in 1 to 5)
393393
if(prob(10))
394-
weighted_feature_spawn_list[/obj/item/gun/energy/laser/captain/scattershot]++
394+
weighted_feature_spawn_list[/obj/item/gun/energy/laser/scattershot]++
395395
else
396396
weighted_feature_spawn_list[/obj/item/melee/spear/bonespear/chitinspear]++
397397

code/modules/reagents/chemistry/reagents/drug_reagents.dm

Lines changed: 0 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -795,44 +795,6 @@
795795
..()
796796
. = 1
797797

798-
/datum/reagent/drug/three_eye
799-
name = "Three Eye"
800-
taste_description = "liquid starlight"
801-
description = "Three Eye is one of the most notorious narcotics to ever come out of the independant habitats, allowing those who take it to see through walls."
802-
reagent_state = LIQUID
803-
color = "#ccccff"
804-
metabolization_rate = REAGENTS_METABOLISM
805-
overdose_threshold = 20 //please don't consume pure caffeine
806-
addiction_threshold = 20 //the addiction isn't that dangerous
807-
trippy = FALSE
808-
var/list/overdose_text = list("Your head pounds.", "You feel lethargic.", "You feel drowsy.", "You feel weak.", "You just want to sleep.")
809-
810-
/datum/reagent/drug/caffeine/on_mob_life(mob/living/carbon/M)
811-
. = ..()
812-
if(prob(1))
813-
var/caffeine_message = pick("You feel alert.")
814-
to_chat(M, span_notice("[caffeine_message]"))
815-
M.adjust_drowsiness(-6 SECONDS * REM)
816-
M.AdjustSleeping(-4 SECONDS, FALSE)
817-
M.adjust_dizzy(-4 SECONDS * REM)
818-
819-
/datum/reagent/drug/caffeine/overdose_process(mob/living/M)
820-
. = ..()
821-
ADD_TRAIT(L, TRAIT_THERMAL_VISION, type)
822-
L.add_client_colour(/datum/client_colour/thirdeye)
823-
L.update_sight()
824-
825-
/datum/reagent/drug/three_eye/on_mob_end_metabolize(mob/living/L)
826-
REMOVE_TRAIT(L, TRAIT_THERMAL_VISION, type)
827-
L.remove_client_colour(/datum/client_colour/thirdeye)
828-
L.update_sight()
829-
return ..()
830-
831-
/datum/reagent/drug/caffeine/proc/apply_drowsy(mob/living/M)
832-
M.adjust_drowsiness_up_to(3 SECONDS * REM, 10 SECONDS)
833-
if(prob(50))
834-
to_chat(M, span_warning(pick(overdose_text)))
835-
836798
/**
837799
* doesn't call the parent addiction acts because it doesn't function the same way
838800
*/

0 commit comments

Comments
 (0)