-
-
Notifications
You must be signed in to change notification settings - Fork 1.1k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[HOLY SHIT!]Charlie, lets go to candy mountain, charlie #2903
Changes from 2 commits
80eb828
4b7253b
046b0b9
96c5a5c
5d7aa0a
1a70e9c
027d966
4e1f63d
2146cc0
5de62e2
648ede2
b58ed5a
92e15c1
a4c420c
bd19dc6
948adea
2623f75
87d2023
678a2e9
ba87398
124fc7c
56d9a12
5f7c634
b691b71
0fa96f2
9b80140
51013b9
cc8f402
363da58
95dca71
f352c29
20b1506
42d8ac6
53f4102
5424446
9b5f844
e9c2d27
b2881bd
3a39d9d
c4d151c
e926935
8daac69
276e5a0
25876fd
6001f3d
0fc841f
12b3ccb
e1899e4
e5f5b68
3b90cb7
eca3edf
5e8fa9d
0f77eb0
545d3ab
b42d865
c501100
7cb4534
3f2ac37
9a55bb1
400ed30
d532473
066fafa
08d7976
d81fbaf
e725613
01ab404
29293dd
3c952cc
b766120
3bd1590
570dd61
7e07369
7d612b0
07381e8
1b4fe03
d861d86
64d8354
bbac400
c8aa308
c65b411
7b1715f
9a804eb
9e88c23
96d713f
71ebef0
5f98feb
9fea6b7
204d8bd
8796724
378c5d0
60baa8c
960e552
ac02c8a
fe3eb50
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -4,18 +4,79 @@ | |
/obj/effect/proc_holder/changeling/augmented_eyesight | ||
name = "Augmented Eyesight" | ||
desc = "Creates heat receptors in our eyes and dramatically increases light sensing ability." | ||
helptext = "Grants us night vision and thermal vision. It may be toggled on or off." | ||
helptext = "Grants us thermal vision or flash protection. We will become a lot more vulnerable to flash-based devices while thermal vision is active." | ||
chemical_cost = 0 | ||
dna_cost = 2 //Would be 1 without thermal vision | ||
var/active = 0 //Whether or not vision is enhanced | ||
|
||
/obj/effect/proc_holder/changeling/augmented_eyesight/sting_action(mob/living/carbon/human/user) | ||
if(!istype(user)) | ||
return | ||
if(user.get_int_organ(/obj/item/organ/internal/cyberimp/eyes/thermals/ling)) | ||
user << "<span class='notice'>Our eyes are protected from flashes.</span>" | ||
var/obj/item/organ/internal/cyberimp/eyes/O = new /obj/item/organ/internal/cyberimp/eyes/shield/ling() | ||
O.Insert(user) | ||
|
||
/obj/effect/proc_holder/changeling/augmented_eyesight/sting_action(var/mob/user) | ||
if(!user.vision_type) | ||
user << "<span class='notice'>We feel a minute twitch in our eyes, and darkness creeps away.</span>" | ||
user.vision_type = new /datum/vision_override/nightvision/thermals/ling_augmented_eyesight | ||
else | ||
user << "<span class='notice'>Our vision dulls. Shadows gather.</span>" | ||
user.vision_type = null | ||
var/obj/item/organ/internal/cyberimp/eyes/O = new /obj/item/organ/internal/cyberimp/eyes/thermals/ling() | ||
O.Insert(user) | ||
|
||
return 1 | ||
|
||
|
||
/obj/effect/proc_holder/changeling/augmented_eyesight/on_refund(mob/user) | ||
user.vision_type = null | ||
var/obj/item/organ/internal/cyberimp/eyes/O = user.get_organ_slot("eye_ling") | ||
if(O) | ||
O.Remove(user) | ||
qdel(O) | ||
|
||
|
||
|
||
|
||
|
||
/obj/item/organ/internal/cyberimp/eyes/shield/ling | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. ahhh yis. Time to butcher lings before shoving them into the incinerator, now. |
||
name = "protective membranes" | ||
desc = "These variable transparency organic membranes will protect you from welders and flashes and heal your eye damage." | ||
icon_state = "ling_eyeshield" | ||
eye_color = null | ||
implant_overlay = null | ||
origin_tech = "biotech=4" | ||
slot = "eye_ling" | ||
status = ORGAN_ORGANIC | ||
|
||
/obj/item/organ/internal/cyberimp/eyes/shield/ling/on_life() | ||
..() | ||
if(owner.eye_blind || owner.eye_stat || owner.eye_blurry || (owner.disabilities & BLIND) || (owner.disabilities & NEARSIGHT)) | ||
owner.reagents.add_reagent("oculine", 1) | ||
|
||
/obj/item/organ/internal/cyberimp/eyes/shield/ling/prepare_eat() | ||
var/obj/S = ..() | ||
S.reagents.add.reagent("oculine", 15) | ||
return S | ||
|
||
|
||
/obj/item/organ/internal/cyberimp/eyes/thermals/ling | ||
name = "heat receptors" | ||
desc = "These heat receptors dramatically increases eyes light sensing ability." | ||
icon_state = "ling_thermal" | ||
eye_color = null | ||
implant_overlay = null | ||
origin_tech = "biotech=5;magnets=5" | ||
slot = "eye_ling" | ||
status = ORGAN_ORGANIC | ||
aug_message = "You feel a minute twitch in our eyes, and darkness creeps away." | ||
|
||
/obj/item/organ/internal/cyberimp/eyes/thermals/ling/emp_act(severity) | ||
return | ||
|
||
/obj/item/organ/internal/cyberimp/eyes/thermals/ling/Insert(mob/living/carbon/M, special = 0) | ||
..() | ||
if(ishuman(owner)) | ||
var/mob/living/carbon/human/H = owner | ||
H.weakeyes = 1 | ||
|
||
/obj/item/organ/internal/cyberimp/eyes/thermals/ling/Remove(mob/living/carbon/M, special = 0) | ||
if(ishuman(owner)) | ||
var/mob/living/carbon/human/H = owner | ||
H.weakeyes = 0 | ||
..() |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -10,6 +10,15 @@ | |
/obj/effect/proc_holder/changeling/panacea/sting_action(var/mob/user) | ||
|
||
user << "<span class='notice'>We cleanse impurities from our form.</span>" | ||
|
||
var/obj/item/organ/internal/body_egg/egg = user.get_int_organ(/obj/item/organ/internal/body_egg) | ||
if(egg) | ||
egg.Remove(user) | ||
if(iscarbon(user)) | ||
var/mob/living/carbon/C = user | ||
C.vomit(0) | ||
egg.loc = get_turf(user) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. egg.forcemove(get_turf(user)) There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. code\game\gamemodes\changeling\powers\panacea.dm:20:error: egg.forcemove: undefined proc There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. forceMove, not forccemove. |
||
|
||
user.reagents.add_reagent("mutadone", 10) | ||
user.reagents.add_reagent("potass_iodide", 10) | ||
user.reagents.add_reagent("charcoal", 20) | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -461,7 +461,7 @@ var/global/list/multiverse = list() | |
|
||
if("cyborg") | ||
if(M.get_species() != "Machine") | ||
for(var/obj/item/organ/O in M.organs) | ||
for(var/obj/item/organ/internal/O in M.organs) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. this should apply to every organ |
||
O.robotize() | ||
M.equip_to_slot_or_del(new /obj/item/clothing/glasses/thermal/eyepatch(M), slot_glasses) | ||
M.equip_to_slot_or_del(sword, slot_r_hand) | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -46,10 +46,11 @@ | |
var/mob/M = target | ||
if(ishuman(M) || issmall(M)) | ||
var/mob/living/carbon/C_target = M | ||
var/obj/item/organ/brain/B | ||
if(C_target.brain_op_stage != 4) // Their brain is already taken out | ||
B = new(C_target.loc) | ||
var/obj/item/organ/internal/brain/B = C_target.get_int_organ(/obj/item/organ/internal/brain) | ||
if(B) | ||
B.loc = get_turf(C_target) | ||
B.transfer_identity(C_target) | ||
C_target.internal_organs -= B | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. this has all been removed on main. |
||
var/datum/effect/system/spark_spread/sparks = new | ||
sparks.set_up(4, 0, M.loc) //no idea what the 0 is | ||
sparks.start() | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -322,8 +322,23 @@ | |
|
||
|
||
/obj/structure/alien/egg/attack_hand(mob/user) | ||
user << "<span class='notice'>It feels slimy.</span>" | ||
|
||
if(user.getorgan(/obj/item/organ/internal/xenos/plasmavessel)) | ||
switch(status) | ||
if(BURST) | ||
user << "<span class='notice'>You clear the hatched egg.</span>" | ||
playsound(loc, 'sound/effects/attackblob.ogg', 100, 1) | ||
qdel(src) | ||
return | ||
if(GROWING) | ||
user << "<span class='notice'>The child is not developed yet.</span>" | ||
return | ||
if(GROWN) | ||
user << "<span class='notice'>You retrieve the child.</span>" | ||
Burst(0) | ||
return | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. all of these are trailing returns, byond switches do not ever overflow |
||
else | ||
user << "<span class='notice'>It feels slimy.</span>" | ||
user.changeNext_move(CLICK_CD_MELEE) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. this changeNext_move is unnecessary |
||
|
||
/obj/structure/alien/egg/proc/GetFacehugger() | ||
return locate(/obj/item/clothing/mask/facehugger) in contents | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -202,7 +202,7 @@ REAGENT SCANNER | |
// user.show_message("\blue Bloodstream Analysis located [M.reagents:get_reagent_amount("epinephrine")] units of rejuvenation chemicals.") | ||
if (M.has_brain_worms()) | ||
user.show_message("\red Subject suffering from aberrant brain activity. Recommend further scanning.") | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. spans There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. i only changed the internal organs path names and the cyber implant detectection... I AM NOT takking out the color macro code for the entire file that i only touched two things on. No. ;-; |
||
else if (M.getBrainLoss() >= 100 || istype(M, /mob/living/carbon/human) && M:brain_op_stage == 4.0) | ||
else if (M.getBrainLoss() >= 100 || istype(M, /mob/living/carbon/human) && !M.get_int_organ(/obj/item/organ/internal/brain)) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Only one species with that, and that is the IPC brain, which should be kinda maybe be a subtype, because then you can implant posibrains into people and they will live! |
||
user.show_message("\red Subject is brain dead.") | ||
else if (M.getBrainLoss() >= 60) | ||
user.show_message("\red Severe brain damage detected. Subject likely to have mental retardation.") | ||
|
@@ -245,6 +245,14 @@ REAGENT SCANNER | |
if(H.heart_attack) | ||
user.show_message("<span class='userdanger'>Subject suffering from heart attack: Apply defibrillator immediately.</span>") | ||
user.show_message("\blue Subject's pulse: <font color='[H.pulse == PULSE_THREADY || H.pulse == PULSE_NONE ? "red" : "blue"]'>[H.get_pulse(GETPULSE_TOOL)] bpm.</font>") | ||
var/implant_detect | ||
for(var/obj/item/organ/internal/cyberimp/CI in H.internal_organs) | ||
if(CI.status == ORGAN_ROBOT && !(species && species.name == "Machine")) | ||
implant_detect += "[H.name] is modified with a [CI.name].<br>" | ||
if(implant_detect) | ||
user.show_message("<span class='notice'>Detected cybernetic modifications:</span>") | ||
user.show_message("<span class='notice'>[implant_detect]</span>") | ||
|
||
src.add_fingerprint(user) | ||
return | ||
|
||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -383,7 +383,7 @@ | |
defib.deductcharge(revivecost) | ||
add_logs(M, user, "revived", object="defibrillator") | ||
else | ||
if(tplus > tlimit) | ||
if(tplus > tlimit|| !H.get_int_organ(/obj/item/organ/internal/heart)) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Later, perhaps we can have organs take damage while in a dead body, and have that be the criterion for "too late for defib". |
||
user.visible_message("<span class='boldnotice'>[defib] buzzes: Resuscitation failed - Heart tissue damage beyond point of no return for defibrillation.</span>") | ||
else if(total_burn >= 180 || total_brute >= 180) | ||
user.visible_message("<span class='boldnotice'>[defib] buzzes: Resuscitation failed - Severe tissue damage detected.</span>") | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
note to self: make this work with this new organ system. Ripping someone's brain out would be hilarious.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
it might, just something i can do later