cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-21 12:04:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport

Browse Source 
Conflicts:
	icons/turf/areas.dmi
	maps/RandomZLevels/stationCollision.dmm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
This commit is contained in:
Cael_Aislinn
2013-01-07 22:26:24 +10:00
parent e263f273f1 be47b96d63
commit 7efc1aafef
25 changed files with 375 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/robot/robot_parts.dm
+1 -1
View File
@@ -198,6 +198,7 @@
user.drop_item()
O.mmi = W
O.invisibility = 0
O.custom_name = created_name
O.updatename("Default")
@@ -212,7 +213,6 @@
O.cell = chest.cell
O.cell.loc = O
W.loc = O//Should fix cybros run time erroring when blown up. It got deleted before, along with the frame.
O.mmi = W
feedback_inc("cyborg_birth",1)
code/game/objects/items/weapons/implants/implant.dm
+42 -19
View File
@@ -1,7 +1,10 @@
/obj/item/weapon/implant
name = "implant"
icon = 'device.dmi'
icon_state = "implant"
var/implanted = null
var/mob/imp_in = null
var/datum/organ/external/part = null
color = "b"
var/allow_reagents = 0
@@ -23,8 +26,8 @@
proc/hear(message, source as mob)
return
proc/islegal()
return 0
/obj/item/weapon/implant/tracking
name = "tracking"
@@ -82,6 +85,8 @@ Implant Specifics:<BR>"}
if(src.imp_in)
src.imp_in.gib()
islegal()
return 0
//BS12 Explosive
/obj/item/weapon/implant/explosive
name = "explosive implant"
@@ -110,15 +115,18 @@ Implant Specifics:<BR>"}
var/list/replacechars = list("'" = "","\"" = "",">" = "","<" = "","(" = "",")" = "")
msg = sanitize_simple(msg, replacechars)
if(findtext(msg,phrase))
if(istype(imp_in, /mob/))
var/mob/T = imp_in
T.gib()
explosion(get_turf(imp_in), 1, 3, 4, 6, 3)
var/turf/t = get_turf(imp_in)
if(t)
t.hotspot_expose(3500,125)
activate()
del(src)
activate()
if(istype(imp_in, /mob/))
var/mob/T = imp_in
T.gib()
explosion(get_turf(imp_in), 1, 3, 4, 6, 3)
var/turf/t = get_turf(imp_in)
if(t)
t.hotspot_expose(3500,125)
implanted(mob/source as mob)
phrase = input("Choose activation phrase:") as text
var/list/replacechars = list("'" = "","\"" = "",">" = "","<" = "","(" = "",")" = "")
@@ -127,6 +135,8 @@ Implant Specifics:<BR>"}
usr << "The implanted explosive implant in [source] can be activated by saying something containing the phrase ''[src.phrase]'', <B>say [src.phrase]</B> to attempt to activate."
return 1
islegal()
return 0
/obj/item/weapon/implant/chem
name = "chem"
@@ -266,14 +276,16 @@ the implant may become unstable and either pre-maturely inject the subject or si
process()
if (!implanted) return
var/mob/M = imp_in
var/area/t = get_area(M)
if(isnull(M)) // If the mob got gibbed
var/obj/item/device/radio/headset/a = new /obj/item/device/radio/headset(null)
a.autosay("[mobname] has died-zzzzt in-in-in...", "[mobname]'s Death Alarm")
del(a)
processing_objects.Remove(src)
activate()
else if(M.stat == 2)
activate("death")
activate(var/cause)
var/mob/M = imp_in
var/area/t = get_area(M)
if(cause == "death")
var/obj/item/device/radio/headset/a = new /obj/item/device/radio/headset(null)
if(istype(t, /area/syndicate_station) || istype(t, /area/syndicate_mothership) || istype(t, /area/shuttle/syndicate_elite) )
//give the syndies a bit of stealth
@@ -282,7 +294,11 @@ the implant may become unstable and either pre-maturely inject the subject or si
a.autosay("[mobname] has died in [t.name]!", "[mobname]'s Death Alarm")
del(a)
processing_objects.Remove(src)
else
var/obj/item/device/radio/headset/a = new /obj/item/device/radio/headset(null)
a.autosay("[mobname] has died-zzzzt in-in-in...", "[mobname]'s Death Alarm")
del(a)
processing_objects.Remove(src)
implanted(mob/source as mob)
mobname = source.real_name
@@ -314,13 +330,20 @@ the implant may become unstable and either pre-maturely inject the subject or si
if (emote == src.activation_emote)
source << "The air glows as \the [src.scanned.name] uncompresses."
var/turf/t = get_turf(source)
src.scanned.loc = t
del src
activate()
activate()
var/turf/t = get_turf(src)
src.scanned.loc = t
if (part) part.implants -= src
del src
implanted(mob/source as mob)
src.activation_emote = input("Choose activation emote:") in list("blink", "blink_r", "eyebrow", "chuckle", "twitch_s", "frown", "nod", "blush", "giggle", "grin", "groan", "shrug", "smile", "pale", "sniff", "whimper", "wink")
source.mind.store_memory("Freedom implant can be activated by using the [src.activation_emote] emote, <B>say *[src.activation_emote]</B> to attempt to activate.", 0, 0)
if (source.mind)
source.mind.store_memory("Freedom implant can be activated by using the [src.activation_emote] emote, <B>say *[src.activation_emote]</B> to attempt to activate.", 0, 0)
source << "The implanted freedom implant can be activated by using the [src.activation_emote] emote, <B>say *[src.activation_emote]</B> to attempt to activate."
return 1
islegal()
return 0
code/game/objects/items/weapons/implants/implanter.dm
+9
View File
@@ -40,6 +40,11 @@
src.imp.loc = M
src.imp.imp_in = M
src.imp.implanted = 1
if (ishuman(M))
var/mob/living/carbon/human/H = M
var/datum/organ/external/affected = H.get_organ(user.zone_sel.selecting)
affected.implants += src.imp
imp.part = affected
src.imp = null
update()
@@ -107,6 +112,10 @@
/obj/item/weapon/implanter/compressed/afterattack(atom/A, mob/user as mob)
if(istype(A,/obj/item) && imp)
var/obj/item/weapon/implant/compressed/c = imp
if (c.scanned)
user << "\red Something is already scanned inside the implant!"
return
imp:scanned = A
A.loc.contents.Remove(A)
update()