mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-07-18 18:46:24 +01:00
some more new to init (#17231)
* some more new to init * rigs * rigs * intellisense moment * telcoms and landmarks * fix that as well * some more minor things * re add missing message * fix trash eating...
This commit is contained in:
@@ -128,11 +128,10 @@
|
||||
'Ignore' - keywords in the speech won't have any effect.
|
||||
'Implant-toggle' - toggles implant."}
|
||||
|
||||
/obj/item/implanter/sizecontrol/New()
|
||||
/obj/item/implanter/sizecontrol/Initialize(mapload)
|
||||
. = ..()
|
||||
src.imp = new /obj/item/implant/sizecontrol( src )
|
||||
..()
|
||||
update()
|
||||
return
|
||||
|
||||
|
||||
//////////////////////////////
|
||||
@@ -153,11 +152,10 @@ Due to the small chemical capacity of the implant, the life of the implant is re
|
||||
safeties to prevent lethal or actively harmful commands from being input to lessen the severity of the crime if they are caught. This one has a golden stamp \
|
||||
with the shape of a star on it, the letters 'KE' in black text on it."
|
||||
|
||||
/obj/item/implanter/compliance/New()
|
||||
src.imp = new /obj/item/implant/compliance( src )
|
||||
..()
|
||||
/obj/item/implanter/compliance/Initialize(mapload)
|
||||
. = ..()
|
||||
imp = new /obj/item/implant/compliance(src)
|
||||
update()
|
||||
return
|
||||
|
||||
/obj/item/implanter/compliance/attack_self(mob/user)
|
||||
if(istype(imp,/obj/item/implant/compliance))
|
||||
|
||||
@@ -12,51 +12,51 @@
|
||||
var/obj/item/implant/imp = null
|
||||
|
||||
/obj/item/implantcase/proc/update()
|
||||
if (src.imp)
|
||||
src.icon_state = text("implantcase-[]", src.imp.implant_color)
|
||||
if (imp)
|
||||
icon_state = text("implantcase-[]", imp.implant_color)
|
||||
else
|
||||
src.icon_state = "implantcase-0"
|
||||
icon_state = "implantcase-0"
|
||||
return
|
||||
|
||||
/obj/item/implantcase/attackby(obj/item/I as obj, mob/user as mob)
|
||||
..()
|
||||
if (istype(I, /obj/item/pen))
|
||||
var/t = tgui_input_text(user, "What would you like the label to be?", text("[]", src.name), null, MAX_NAME_LEN)
|
||||
var/t = tgui_input_text(user, "What would you like the label to be?", text("[]", name), null, MAX_NAME_LEN)
|
||||
if (user.get_active_hand() != I)
|
||||
return
|
||||
if((!in_range(src, user) && src.loc != user))
|
||||
if((!in_range(src, user) && loc != user))
|
||||
return
|
||||
t = sanitizeSafe(t, MAX_NAME_LEN)
|
||||
if(t)
|
||||
src.name = text("Glass Case - '[]'", t)
|
||||
name = text("Glass Case - '[]'", t)
|
||||
else
|
||||
src.name = "Glass Case"
|
||||
name = "Glass Case"
|
||||
else if(istype(I, /obj/item/reagent_containers/syringe))
|
||||
if(!src.imp) return
|
||||
if(!src.imp.allow_reagents) return
|
||||
if(src.imp.reagents.total_volume >= src.imp.reagents.maximum_volume)
|
||||
if(!imp) return
|
||||
if(!imp.allow_reagents) return
|
||||
if(imp.reagents.total_volume >= imp.reagents.maximum_volume)
|
||||
to_chat(user, span_warning("\The [src] is full."))
|
||||
else
|
||||
spawn(5)
|
||||
I.reagents.trans_to_obj(src.imp, 5)
|
||||
I.reagents.trans_to_obj(imp, 5)
|
||||
to_chat(user, span_notice("You inject 5 units of the solution. The syringe now contains [I.reagents.total_volume] units."))
|
||||
else if (istype(I, /obj/item/implanter))
|
||||
var/obj/item/implanter/M = I
|
||||
if (M.imp)
|
||||
if ((src.imp || M.imp.implanted))
|
||||
if ((imp || M.imp.implanted))
|
||||
return
|
||||
M.imp.loc = src
|
||||
src.imp = M.imp
|
||||
imp = M.imp
|
||||
M.imp = null
|
||||
src.update()
|
||||
update()
|
||||
M.update()
|
||||
else
|
||||
if (src.imp)
|
||||
if (imp)
|
||||
if (M.imp)
|
||||
return
|
||||
src.imp.loc = M
|
||||
M.imp = src.imp
|
||||
src.imp = null
|
||||
imp.loc = M
|
||||
M.imp = imp
|
||||
imp = null
|
||||
update()
|
||||
M.update()
|
||||
return
|
||||
@@ -67,10 +67,9 @@
|
||||
desc = "A case containing a tracking implant."
|
||||
icon_state = "implantcase-b"
|
||||
|
||||
/obj/item/implantcase/tracking/New()
|
||||
src.imp = new /obj/item/implant/tracking( src )
|
||||
..()
|
||||
return
|
||||
/obj/item/implantcase/tracking/Initialize(mapload)
|
||||
. = ..()
|
||||
imp = new /obj/item/implant/tracking(src)
|
||||
|
||||
|
||||
/obj/item/implantcase/explosive
|
||||
@@ -78,10 +77,9 @@
|
||||
desc = "A case containing an explosive implant."
|
||||
icon_state = "implantcase-r"
|
||||
|
||||
/obj/item/implantcase/explosive/New()
|
||||
src.imp = new /obj/item/implant/explosive( src )
|
||||
..()
|
||||
return
|
||||
/obj/item/implantcase/explosive/Initialize(mapload)
|
||||
. = ..()
|
||||
imp = new /obj/item/implant/explosive(src)
|
||||
|
||||
|
||||
/obj/item/implantcase/chem
|
||||
@@ -89,10 +87,9 @@
|
||||
desc = "A case containing a chemical implant."
|
||||
icon_state = "implantcase-b"
|
||||
|
||||
/obj/item/implantcase/chem/New()
|
||||
src.imp = new /obj/item/implant/chem( src )
|
||||
..()
|
||||
return
|
||||
/obj/item/implantcase/chem/Initialize(mapload)
|
||||
. = ..()
|
||||
imp = new /obj/item/implant/chem(src)
|
||||
|
||||
|
||||
/obj/item/implantcase/loyalty
|
||||
@@ -100,10 +97,9 @@
|
||||
desc = "A case containing a loyalty implant."
|
||||
icon_state = "implantcase-r"
|
||||
|
||||
/obj/item/implantcase/loyalty/New()
|
||||
src.imp = new /obj/item/implant/loyalty( src )
|
||||
..()
|
||||
return
|
||||
/obj/item/implantcase/loyalty/Initialize(mapload)
|
||||
. = ..()
|
||||
imp = new /obj/item/implant/loyalty(src)
|
||||
|
||||
|
||||
/obj/item/implantcase/death_alarm
|
||||
@@ -111,10 +107,9 @@
|
||||
desc = "A case containing a death alarm implant."
|
||||
icon_state = "implantcase-b"
|
||||
|
||||
/obj/item/implantcase/death_alarm/New()
|
||||
src.imp = new /obj/item/implant/death_alarm( src )
|
||||
..()
|
||||
return
|
||||
/obj/item/implantcase/death_alarm/Initialize(mapload)
|
||||
. = ..()
|
||||
imp = new /obj/item/implant/death_alarm(src)
|
||||
|
||||
|
||||
/obj/item/implantcase/freedom
|
||||
@@ -122,10 +117,9 @@
|
||||
desc = "A case containing a freedom implant."
|
||||
icon_state = "implantcase-r"
|
||||
|
||||
/obj/item/implantcase/freedom/New()
|
||||
src.imp = new /obj/item/implant/freedom( src )
|
||||
..()
|
||||
return
|
||||
/obj/item/implantcase/freedom/Initialize(mapload)
|
||||
. = ..()
|
||||
imp = new /obj/item/implant/freedom(src)
|
||||
|
||||
|
||||
/obj/item/implantcase/adrenalin
|
||||
@@ -133,10 +127,9 @@
|
||||
desc = "A case containing an adrenalin implant."
|
||||
icon_state = "implantcase-b"
|
||||
|
||||
/obj/item/implantcase/adrenalin/New()
|
||||
src.imp = new /obj/item/implant/adrenalin( src )
|
||||
..()
|
||||
return
|
||||
/obj/item/implantcase/adrenalin/Initialize(mapload)
|
||||
. = ..()
|
||||
imp = new /obj/item/implant/adrenalin(src)
|
||||
|
||||
|
||||
/obj/item/implantcase/dexplosive
|
||||
@@ -144,10 +137,9 @@
|
||||
desc = "A case containing an explosive."
|
||||
icon_state = "implantcase-r"
|
||||
|
||||
/obj/item/implantcase/dexplosive/New()
|
||||
src.imp = new /obj/item/implant/dexplosive( src )
|
||||
..()
|
||||
return
|
||||
/obj/item/implantcase/dexplosive/Initialize(mapload)
|
||||
. = ..()
|
||||
imp = new /obj/item/implant/dexplosive(src)
|
||||
|
||||
|
||||
/obj/item/implantcase/health
|
||||
@@ -155,157 +147,141 @@
|
||||
desc = "A case containing a health tracking implant."
|
||||
icon_state = "implantcase-b"
|
||||
|
||||
/obj/item/implantcase/health/New()
|
||||
src.imp = new /obj/item/implant/health( src )
|
||||
..()
|
||||
return
|
||||
/obj/item/implantcase/health/Initialize(mapload)
|
||||
. = ..()
|
||||
imp = new /obj/item/implant/health(src)
|
||||
|
||||
/obj/item/implantcase/language
|
||||
name = "glass case - 'GalCom'"
|
||||
desc = "A case containing a GalCom language implant."
|
||||
icon_state = "implantcase-b"
|
||||
|
||||
/obj/item/implantcase/language/New()
|
||||
src.imp = new /obj/item/implant/language( src )
|
||||
..()
|
||||
return
|
||||
/obj/item/implantcase/language/Initialize(mapload)
|
||||
. = ..()
|
||||
imp = new /obj/item/implant/language(src)
|
||||
|
||||
/obj/item/implantcase/language/eal
|
||||
name = "glass case - 'EAL'"
|
||||
desc = "A case containing an Encoded Audio Language implant."
|
||||
icon_state = "implantcase-b"
|
||||
|
||||
/obj/item/implantcase/language/eal/New()
|
||||
src.imp = new /obj/item/implant/language/eal( src )
|
||||
..()
|
||||
return
|
||||
/obj/item/implantcase/language/eal/Initialize(mapload)
|
||||
. = ..()
|
||||
imp = new /obj/item/implant/language/eal(src)
|
||||
|
||||
/obj/item/implantcase/shades
|
||||
name = "glass case - 'Integrated Shades'"
|
||||
desc = "A case containing a nanite fabricator implant."
|
||||
icon_state = "implantcase-b"
|
||||
|
||||
/obj/item/implantcase/shades/New()
|
||||
src.imp = new /obj/item/implant/organ( src )
|
||||
..()
|
||||
return
|
||||
/obj/item/implantcase/shades/Initialize(mapload)
|
||||
. = ..()
|
||||
imp = new /obj/item/implant/organ(src)
|
||||
|
||||
/obj/item/implantcase/taser
|
||||
name = "glass case - 'Taser'"
|
||||
desc = "A case containing a nanite fabricator implant."
|
||||
icon_state = "implantcase-b"
|
||||
|
||||
/obj/item/implantcase/taser/New()
|
||||
src.imp = new /obj/item/implant/organ/limbaugment( src )
|
||||
..()
|
||||
return
|
||||
/obj/item/implantcase/taser/Initialize(mapload)
|
||||
. = ..()
|
||||
imp = new /obj/item/implant/organ/limbaugment(src)
|
||||
|
||||
/obj/item/implantcase/laser
|
||||
name = "glass case - 'Laser'"
|
||||
desc = "A case containing a nanite fabricator implant."
|
||||
icon_state = "implantcase-b"
|
||||
|
||||
/obj/item/implantcase/laser/New()
|
||||
src.imp = new /obj/item/implant/organ/limbaugment/laser( src )
|
||||
..()
|
||||
return
|
||||
/obj/item/implantcase/laser/Initialize(mapload)
|
||||
. = ..()
|
||||
imp = new /obj/item/implant/organ/limbaugment/laser(src)
|
||||
|
||||
/obj/item/implantcase/dart
|
||||
name = "glass case - 'Dart'"
|
||||
desc = "A case containing a nanite fabricator implant."
|
||||
icon_state = "implantcase-b"
|
||||
|
||||
/obj/item/implantcase/dart/New()
|
||||
src.imp = new /obj/item/implant/organ/limbaugment/dart( src )
|
||||
..()
|
||||
return
|
||||
/obj/item/implantcase/dart/Initialize(mapload)
|
||||
. = ..()
|
||||
imp = new /obj/item/implant/organ/limbaugment/dart(src)
|
||||
|
||||
/obj/item/implantcase/toolkit
|
||||
name = "glass case - 'Toolkit'"
|
||||
desc = "A case containing a nanite fabricator implant."
|
||||
icon_state = "implantcase-b"
|
||||
|
||||
/obj/item/implantcase/toolkit/New()
|
||||
src.imp = new /obj/item/implant/organ/limbaugment/upperarm( src )
|
||||
..()
|
||||
return
|
||||
/obj/item/implantcase/toolkit/Initialize(mapload)
|
||||
. = ..()
|
||||
imp = new /obj/item/implant/organ/limbaugment/upperarm(src)
|
||||
|
||||
/obj/item/implantcase/medkit
|
||||
name = "glass case - 'Toolkit'"
|
||||
desc = "A case containing a nanite fabricator implant."
|
||||
icon_state = "implantcase-b"
|
||||
|
||||
/obj/item/implantcase/medkit/New()
|
||||
src.imp = new /obj/item/implant/organ/limbaugment/upperarm/medkit( src )
|
||||
..()
|
||||
return
|
||||
/obj/item/implantcase/medkit/Initialize(mapload)
|
||||
. = ..()
|
||||
imp = new /obj/item/implant/organ/limbaugment/upperarm/medkit(src)
|
||||
|
||||
/obj/item/implantcase/surge
|
||||
name = "glass case - 'Muscle Overclocker'"
|
||||
desc = "A case containing a nanite fabricator implant."
|
||||
icon_state = "implantcase-b"
|
||||
|
||||
/obj/item/implantcase/surge/New()
|
||||
src.imp = new /obj/item/implant/organ/limbaugment/upperarm/surge( src )
|
||||
..()
|
||||
return
|
||||
/obj/item/implantcase/surge/Initialize(mapload)
|
||||
. = ..()
|
||||
imp = new /obj/item/implant/organ/limbaugment/upperarm/surge(src)
|
||||
|
||||
/obj/item/implantcase/analyzer
|
||||
name = "glass case - 'Scanner'"
|
||||
desc = "A case containing a nanite fabricator implant."
|
||||
icon_state = "implantcase-b"
|
||||
|
||||
/obj/item/implantcase/analyzer/New()
|
||||
src.imp = new /obj/item/implant/organ/limbaugment/wrist( src )
|
||||
..()
|
||||
return
|
||||
/obj/item/implantcase/analyzer/Initialize(mapload)
|
||||
. = ..()
|
||||
imp = new /obj/item/implant/organ/limbaugment/wrist(src)
|
||||
|
||||
/obj/item/implantcase/sword
|
||||
name = "glass case - 'Scanner'"
|
||||
desc = "A case containing a nanite fabricator implant."
|
||||
icon_state = "implantcase-b"
|
||||
|
||||
/obj/item/implantcase/sword/New()
|
||||
src.imp = new /obj/item/implant/organ/limbaugment/wrist/sword( src )
|
||||
..()
|
||||
return
|
||||
/obj/item/implantcase/sword/Initialize(mapload)
|
||||
. = ..()
|
||||
imp = new /obj/item/implant/organ/limbaugment/wrist/sword(src)
|
||||
|
||||
/obj/item/implantcase/sprinter
|
||||
name = "glass case - 'Sprinter'"
|
||||
desc = "A case containing a nanite fabricator implant."
|
||||
icon_state = "implantcase-b"
|
||||
|
||||
/obj/item/implantcase/sprinter/New()
|
||||
src.imp = new /obj/item/implant/organ/pelvic( src )
|
||||
..()
|
||||
return
|
||||
/obj/item/implantcase/sprinter/Initialize(mapload)
|
||||
. = ..()
|
||||
imp = new /obj/item/implant/organ/pelvic(src)
|
||||
|
||||
/obj/item/implantcase/armblade
|
||||
name = "glass case - 'Armblade'"
|
||||
desc = "A case containing a nanite fabricator implant."
|
||||
icon_state = "implantcase-b"
|
||||
|
||||
/obj/item/implantcase/armblade/New()
|
||||
src.imp = new /obj/item/implant/organ/limbaugment/upperarm/blade( src )
|
||||
..()
|
||||
return
|
||||
/obj/item/implantcase/armblade/Initialize(mapload)
|
||||
. = ..()
|
||||
imp = new /obj/item/implant/organ/limbaugment/upperarm/blade(src)
|
||||
|
||||
/obj/item/implantcase/handblade
|
||||
name = "glass case - 'Handblade'"
|
||||
desc = "A case containing a nanite fabricator implant."
|
||||
icon_state = "implantcase-b"
|
||||
|
||||
/obj/item/implantcase/handblade/New()
|
||||
src.imp = new /obj/item/implant/organ/limbaugment/wrist/blade( src )
|
||||
..()
|
||||
return
|
||||
/obj/item/implantcase/handblade/Initialize(mapload)
|
||||
. = ..()
|
||||
imp = new /obj/item/implant/organ/limbaugment/wrist/blade(src)
|
||||
|
||||
/obj/item/implantcase/restrainingbolt
|
||||
name = "glass case - 'Restraining Bolt'"
|
||||
desc = "A case containing a restraining bolt."
|
||||
icon_state = "implantcase-b"
|
||||
|
||||
/obj/item/implantcase/restrainingbolt/New()
|
||||
src.imp = new /obj/item/implant/restrainingbolt( src )
|
||||
..()
|
||||
return
|
||||
/obj/item/implantcase/restrainingbolt/Initialize(mapload)
|
||||
. = ..()
|
||||
imp = new /obj/item/implant/restrainingbolt(src)
|
||||
|
||||
@@ -3,7 +3,6 @@
|
||||
desc = "A case containing a language implant."
|
||||
icon_state = "implantcase-r"
|
||||
|
||||
/obj/item/implantcase/vrlanguage/New()
|
||||
src.imp = new /obj/item/implant/vrlanguage( src )
|
||||
..()
|
||||
return
|
||||
/obj/item/implantcase/vrlanguage/Initialize(mapload)
|
||||
. = ..()
|
||||
imp = new /obj/item/implant/vrlanguage(src)
|
||||
|
||||
@@ -77,39 +77,35 @@
|
||||
/obj/item/implanter/loyalty
|
||||
name = "implanter-loyalty"
|
||||
|
||||
/obj/item/implanter/loyalty/New()
|
||||
src.imp = new /obj/item/implant/loyalty( src )
|
||||
..()
|
||||
/obj/item/implanter/loyalty/Initialize(mapload)
|
||||
. = ..()
|
||||
imp = new /obj/item/implant/loyalty(src)
|
||||
update()
|
||||
return
|
||||
|
||||
/obj/item/implanter/explosive
|
||||
name = "implanter (E)"
|
||||
|
||||
/obj/item/implanter/explosive/New()
|
||||
src.imp = new /obj/item/implant/explosive( src )
|
||||
..()
|
||||
/obj/item/implanter/explosive/Initialize(mapload)
|
||||
. = ..()
|
||||
imp = new /obj/item/implant/explosive(src)
|
||||
update()
|
||||
return
|
||||
|
||||
/obj/item/implanter/adrenalin
|
||||
name = "implanter-adrenalin"
|
||||
|
||||
/obj/item/implanter/adrenalin/New()
|
||||
src.imp = new /obj/item/implant/adrenalin(src)
|
||||
..()
|
||||
/obj/item/implanter/adrenalin/Initialize(mapload)
|
||||
. = ..()
|
||||
imp = new /obj/item/implant/adrenalin(src)
|
||||
update()
|
||||
return
|
||||
|
||||
/obj/item/implanter/compressed
|
||||
name = "implanter (C)"
|
||||
icon_state = "cimplanter1"
|
||||
|
||||
/obj/item/implanter/compressed/New()
|
||||
imp = new /obj/item/implant/compressed( src )
|
||||
..()
|
||||
/obj/item/implanter/compressed/Initialize(mapload)
|
||||
. = ..()
|
||||
imp = new /obj/item/implant/compressed(src)
|
||||
update()
|
||||
return
|
||||
|
||||
/obj/item/implanter/compressed/update()
|
||||
if (imp)
|
||||
@@ -158,8 +154,7 @@
|
||||
/obj/item/implanter/restrainingbolt
|
||||
name = "implanter (bolt)"
|
||||
|
||||
/obj/item/implanter/restrainingbolt/New()
|
||||
src.imp = new /obj/item/implant/restrainingbolt( src )
|
||||
..()
|
||||
/obj/item/implanter/restrainingbolt/Initialize(mapload)
|
||||
. = ..()
|
||||
imp = new /obj/item/implant/restrainingbolt(src)
|
||||
update()
|
||||
return
|
||||
|
||||
@@ -8,11 +8,10 @@
|
||||
var/uses = 1.0
|
||||
|
||||
|
||||
/obj/item/implant/freedom/New()
|
||||
src.activation_emote = pick("blink", "blink_r", "eyebrow", "chuckle", "twitch", "frown", "nod", "blush", "giggle", "grin", "groan", "shrug", "smile", "pale", "sniff", "whimper", "wink")
|
||||
src.uses = rand(1, 5)
|
||||
..()
|
||||
return
|
||||
/obj/item/implant/freedom/Initialize(mapload)
|
||||
. = ..()
|
||||
activation_emote = pick("blink", "blink_r", "eyebrow", "chuckle", "twitch", "frown", "nod", "blush", "giggle", "grin", "groan", "shrug", "smile", "pale", "sniff", "whimper", "wink")
|
||||
uses = rand(1, 5)
|
||||
|
||||
|
||||
/obj/item/implant/freedom/trigger(emote, mob/living/carbon/source as mob)
|
||||
|
||||
@@ -17,18 +17,17 @@
|
||||
var/verb_name = "Transfer From Reagent Implant"
|
||||
var/verb_desc = "Remove reagents from an internal reagent into a container"
|
||||
|
||||
/obj/item/implant/reagent_generator/New()
|
||||
..()
|
||||
/obj/item/implant/reagent_generator/Initialize(mapload)
|
||||
. = ..()
|
||||
create_reagents(usable_volume)
|
||||
|
||||
/obj/item/implanter/reagent_generator
|
||||
var/implant_type = /obj/item/implant/reagent_generator
|
||||
|
||||
/obj/item/implanter/reagent_generator/New()
|
||||
..()
|
||||
/obj/item/implanter/reagent_generator/Initialize(mapload)
|
||||
. = ..()
|
||||
imp = new implant_type(src)
|
||||
update()
|
||||
return
|
||||
|
||||
/obj/item/implant/reagent_generator/post_implant(mob/living/carbon/source)
|
||||
START_PROCESSING(SSobj, src)
|
||||
|
||||
Reference in New Issue
Block a user