[MIRROR] Ports Rapid Cable Layers from /vg/ and paradise (#2162)
* Ports Rapid Cable Layers from /vg/ and paradise * rej clean up + manual sync * maps and .rej file cleanup * sprite and WGW memes * actual spellchecked memes * some other map fix memes * fuck it, let's just hard sync maps * dumb paperwork shit for maps * Revert "dumb paperwork shit for maps" This reverts commit 8e70bbec0f407c334cd81f5b92aafdb90544ca9d. * *autistic screeching* * REEEEEEEEEEEEEEEEEEEEE * Fuck off I want to do something else
This commit is contained in:
CitadelStationBot
committed by
Poojawa
Poojawa
parent
76f7fcef9a
commit
8a4ddbe8a8
@@ -168,6 +168,10 @@
|
||||
|
||||
/datum/action/item_action/toggle_firemode
|
||||
name = "Toggle Firemode"
|
||||
|
||||
/datum/action/item_action/rcl
|
||||
name = "Change Cable Color"
|
||||
button_icon_state = "rcl_rainbow"
|
||||
|
||||
/datum/action/item_action/startchainsaw
|
||||
name = "Pull The Starting Cord"
|
||||
|
||||
@@ -1,35 +0,0 @@
|
||||
diff a/code/datums/components/component.dm b/code/datums/components/component.dm (rejected hunks)
|
||||
@@ -47,12 +47,14 @@
|
||||
|
||||
procs[sig_type] = CALLBACK(src, proc_on_self)
|
||||
|
||||
-/datum/component/proc/ReceiveSignal(sigtype, list/sig_args)
|
||||
+/datum/component/proc/ReceiveSignal(sigtype, ...)
|
||||
var/list/sps = signal_procs
|
||||
var/datum/callback/CB = LAZYACCESS(sps, sigtype)
|
||||
if(!CB)
|
||||
return FALSE
|
||||
- return CB.InvokeAsync(arglist(sig_args))
|
||||
+ var/list/arguments = args.Copy()
|
||||
+ arguments.Cut(1, 2)
|
||||
+ return CB.InvokeAsync(arglist(arguments))
|
||||
|
||||
/datum/component/proc/InheritComponent(datum/component/C, i_am_original)
|
||||
return
|
||||
@@ -62,14 +64,14 @@
|
||||
|
||||
/datum/var/list/datum_components //list of /datum/component
|
||||
|
||||
-/datum/proc/SendSignal(sigtype, list/sig_args)
|
||||
+/datum/proc/SendSignal(sigtype, ...)
|
||||
var/list/comps = datum_components
|
||||
. = FALSE
|
||||
for(var/I in comps)
|
||||
var/datum/component/C = I
|
||||
if(!C.enabled)
|
||||
continue
|
||||
- if(C.ReceiveSignal(sigtype, sig_args))
|
||||
+ if(C.ReceiveSignal(arglist(args)))
|
||||
ComponentActivated(C)
|
||||
. = TRUE
|
||||
|
||||
@@ -1,134 +0,0 @@
|
||||
diff a/code/datums/diseases/advance/symptoms/sensory.dm b/code/datums/diseases/advance/symptoms/sensory.dm (rejected hunks)
|
||||
@@ -23,106 +23,43 @@ Bonus
|
||||
transmittable = -3
|
||||
level = 5
|
||||
severity = 0
|
||||
+ symptom_delay_min = 5
|
||||
+ symptom_delay_max = 10
|
||||
+ var/purge_alcohol = FALSE
|
||||
+ var/brain_heal = FALSE
|
||||
|
||||
-/datum/symptom/sensory_restoration/Activate(var/datum/disease/advance/A)
|
||||
+/datum/symptom/sensory_restoration/Start(datum/disease/advance/A)
|
||||
..()
|
||||
+ if(A.properties["resistance"] >= 6) //heal brain damage
|
||||
+ brain_heal = TRUE
|
||||
+ if(A.properties["transmittable"] >= 8) //purge alcohol
|
||||
+ purge_alcohol = TRUE
|
||||
+
|
||||
+/datum/symptom/sensory_restoration/Activate(var/datum/disease/advance/A)
|
||||
+ if(!..())
|
||||
+ return
|
||||
var/mob/living/M = A.affected_mob
|
||||
if(A.stage >= 2)
|
||||
M.restoreEars()
|
||||
|
||||
if(A.stage >= 3)
|
||||
- M.dizziness = 0
|
||||
- M.drowsyness = 0
|
||||
- M.slurring = 0
|
||||
- M.confused = 0
|
||||
- M.reagents.remove_all_type(/datum/reagent/consumable/ethanol, 3)
|
||||
- if(ishuman(M))
|
||||
- var/mob/living/carbon/human/H = M
|
||||
- H.drunkenness = max(H.drunkenness - 10, 0)
|
||||
+ M.dizziness = max(0, M.dizziness - 2)
|
||||
+ M.drowsyness = max(0, M.drowsyness - 2)
|
||||
+ M.slurring = max(0, M.slurring - 2)
|
||||
+ M.confused = max(0, M.confused - 2)
|
||||
+ if(purge_alcohol)
|
||||
+ M.reagents.remove_all_type(/datum/reagent/consumable/ethanol, 3)
|
||||
+ if(ishuman(M))
|
||||
+ var/mob/living/carbon/human/H = M
|
||||
+ H.drunkenness = max(H.drunkenness - 5, 0)
|
||||
|
||||
if(A.stage >= 4)
|
||||
- M.drowsyness = max(M.drowsyness-5, 0)
|
||||
+ M.drowsyness = max(0, M.drowsyness - 2)
|
||||
if(M.reagents.has_reagent("mindbreaker"))
|
||||
M.reagents.remove_reagent("mindbreaker", 5)
|
||||
if(M.reagents.has_reagent("histamine"))
|
||||
M.reagents.remove_reagent("histamine", 5)
|
||||
M.hallucination = max(0, M.hallucination - 10)
|
||||
|
||||
- if(A.stage >= 5)
|
||||
- M.adjustBrainLoss(-3)
|
||||
-
|
||||
-/*
|
||||
-//////////////////////////////////////
|
||||
-Sensory-Destruction
|
||||
- noticable.
|
||||
- Lowers resistance
|
||||
- Decreases stage speed tremendously.
|
||||
- Decreases transmittablity tremendously.
|
||||
- the drugs hit them so hard they have to focus on not dying
|
||||
-
|
||||
-Bonus
|
||||
- The body generates Sensory destructive chemicals.
|
||||
- You cannot taste anything anymore.
|
||||
- ethanol for extremely drunk victim
|
||||
- mindbreaker to break the mind
|
||||
- impedrezene to ruin the brain
|
||||
-
|
||||
-//////////////////////////////////////
|
||||
-*/
|
||||
-/datum/symptom/sensory_destruction
|
||||
- name = "Sensory destruction"
|
||||
- stealth = -1
|
||||
- resistance = -2
|
||||
- stage_speed = -3
|
||||
- transmittable = -4
|
||||
- level = 6
|
||||
- severity = 5
|
||||
- var/sleepy = 0
|
||||
- var/sleepy_ticks = 0
|
||||
-
|
||||
-/datum/symptom/sensory_destruction/Activate(var/datum/disease/advance/A)
|
||||
- ..()
|
||||
- var/mob/living/M = A.affected_mob
|
||||
- if(prob(SYMPTOM_ACTIVATION_PROB))
|
||||
- switch(A.stage)
|
||||
- if(1)
|
||||
- to_chat(M, "<span class='warning'>You can't feel anything.</span>")
|
||||
- if(2)
|
||||
- to_chat(M, "<span class='warning'>You feel absolutely hammered.</span>")
|
||||
- if(prob(10))
|
||||
- sleepy_ticks += rand(10,14)
|
||||
- if(3)
|
||||
- M.reagents.add_reagent("ethanol",rand(5,7))
|
||||
- to_chat(M, "<span class='warning'>You try to focus on not dying.</span>")
|
||||
- if(prob(15))
|
||||
- sleepy_ticks += rand(10,14)
|
||||
- if(4)
|
||||
- M.reagents.add_reagent("ethanol",rand(6,10))
|
||||
- to_chat(M, "<span class='warning'>u can count 2 potato!</span>")
|
||||
- if(prob(20))
|
||||
- sleepy_ticks += rand(10,14)
|
||||
- if(5)
|
||||
- M.reagents.add_reagent("ethanol",rand(7,13))
|
||||
- if(prob(25))
|
||||
- sleepy_ticks += rand(10,14)
|
||||
-
|
||||
- if(sleepy_ticks)
|
||||
- if(A.stage>=4)
|
||||
- M.hallucination = min(M.hallucination + 10, 50)
|
||||
- if(A.stage>=5)
|
||||
- if(prob(80))
|
||||
- M.adjustBrainLoss(1)
|
||||
- if(prob(50))
|
||||
- M.drowsyness = max(M.drowsyness, 3)
|
||||
- sleepy++
|
||||
- sleepy_ticks--
|
||||
- else
|
||||
- sleepy = 0
|
||||
-
|
||||
- switch(sleepy) //Works like morphine
|
||||
- if(11)
|
||||
- to_chat(M, "<span class='warning'>You start to feel tired...</span>")
|
||||
- if(12 to 24)
|
||||
- M.drowsyness += 1
|
||||
- if(24 to INFINITY)
|
||||
- M.Sleeping(2, 0)
|
||||
+ if(brain_heal && A.stage >= 5)
|
||||
+ M.adjustBrainLoss(-3)
|
||||
\ No newline at end of file
|
||||
@@ -1,19 +0,0 @@
|
||||
diff a/code/datums/diseases/advance/symptoms/vision.dm b/code/datums/diseases/advance/symptoms/vision.dm (rejected hunks)
|
||||
@@ -40,7 +40,7 @@ Bonus
|
||||
if(!..())
|
||||
return
|
||||
var/mob/living/carbon/M = A.affected_mob
|
||||
- var/obj/item/organ/eyes = M.getorganslot("eye_sight")
|
||||
+ var/obj/item/organ/eyes/eyes = M.getorganslot("eye_sight")
|
||||
if(istype(eyes))
|
||||
switch(A.stage)
|
||||
if(1, 2)
|
||||
@@ -55,7 +55,7 @@ Bonus
|
||||
M.adjust_eye_damage(5)
|
||||
if(eyes.eye_damage >= 10)
|
||||
M.become_nearsighted()
|
||||
- if(prob(M.eye_damage - 10 + 1))
|
||||
+ if(prob(eyes.eye_damage - 10 + 1))
|
||||
if(!remove_eyes)
|
||||
if(M.become_blind())
|
||||
to_chat(M, "<span class='userdanger'>You go blind!</span>")
|
||||
@@ -1,30 +0,0 @@
|
||||
diff a/code/datums/diseases/advance/symptoms/vomit.dm b/code/datums/diseases/advance/symptoms/vomit.dm (rejected hunks)
|
||||
@@ -32,7 +32,7 @@ Bonus
|
||||
symptom_delay_min = 25
|
||||
symptom_delay_max = 80
|
||||
var/vomit_blood = FALSE
|
||||
- var/proj_vomit = FALSE
|
||||
+ var/proj_vomit = 0
|
||||
|
||||
/datum/symptom/vomit/Start(datum/disease/advance/A)
|
||||
..()
|
||||
@@ -41,7 +41,7 @@ Bonus
|
||||
if(A.properties["resistance"] >= 7) //blood vomit
|
||||
vomit_blood = TRUE
|
||||
if(A.properties["transmittable"] >= 7) //projectile vomit
|
||||
- proj_vomit = TRUE
|
||||
+ proj_vomit = 5
|
||||
|
||||
/datum/symptom/vomit/Activate(datum/disease/advance/A)
|
||||
if(!..())
|
||||
@@ -52,7 +52,7 @@ Bonus
|
||||
if(prob(base_message_chance) && !suppress_warning)
|
||||
to_chat(M, "<span class='warning'>[pick("You feel nauseous.", "You feel like you're going to throw up!")]</span>")
|
||||
else
|
||||
- Vomit(M)
|
||||
+ vomit(M)
|
||||
|
||||
-/datum/symptom/vomit/proc/Vomit(mob/living/carbon/M)
|
||||
- M.vomit(20, vomit_blood, distance = 5 * proj_vomit)
|
||||
+/datum/symptom/vomit/proc/vomit(mob/living/carbon/M)
|
||||
+ M.vomit(20, vomit_blood, distance = proj_vomit)
|
||||
Reference in New Issue
Block a user