cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-20 03:25:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

this was meant to be a one line change (#18982)

Browse Source
This commit is contained in:
Contrabang
2022-09-07 08:40:25 -04:00
committed by GitHub
parent 12725d9e03
commit 0336e122ee
19 changed files with 69 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/implants/implant_abductor.dm
+2 -8
View File
@@ -51,15 +51,9 @@
/obj/item/implanter/abductor
name = "implanter (abductor)"
/obj/item/implanter/abductor/Initialize(mapload)
. = ..()
imp = new /obj/item/implant/abductor(src)
implant_type = /obj/item/implant/abductor
/obj/item/implantcase/abductor
name = "implant case - 'abductor'"
desc = "A glass case containing an abductor implant."
/obj/item/implantcase/abductor/Initialize(mapload)
. = ..()
imp = new /obj/item/implant/abductor(src)
implant_type = /obj/item/implant/abductor
code/game/objects/items/weapons/implants/implant_adrenalin.dm
+2 -8
View File
@@ -25,15 +25,9 @@
/obj/item/implanter/adrenalin
name = "implanter (adrenalin)"
/obj/item/implanter/adrenalin/Initialize(mapload)
. = ..()
imp = new /obj/item/implant/adrenalin(src)
implant_type = /obj/item/implant/adrenalin
/obj/item/implantcase/adrenaline
name = "implant case - 'Adrenaline'"
desc = "A glass case containing an adrenaline implant."
/obj/item/implantcase/adrenaline/Initialize(mapload)
. = ..()
imp = new /obj/item/implant/adrenalin(src)
implant_type = /obj/item/implant/adrenalin
code/game/objects/items/weapons/implants/implant_chem.dm
+2 -7
View File
@@ -37,14 +37,9 @@
/obj/item/implanter/chem
name = "implanter (chem)"
implant_type = /obj/item/implant/chem
/obj/item/implanter/chem/Initialize(mapload)
. = ..()
imp = new /obj/item/implant/dust(src)
/obj/item/implantcase/chem
name = "implant case - 'Remote Chemical'"
desc = "A glass case containing a remote chemical implant."
/obj/item/implantcase/chem/Initialize(mapload)
. = ..()
imp = new /obj/item/implant/chem(src)
implant_type = /obj/item/implant/chem
code/game/objects/items/weapons/implants/implant_death_alarm.dm
+2 -8
View File
@@ -55,15 +55,9 @@
/obj/item/implanter/death_alarm
name = "implanter (Death Alarm)"
/obj/item/implanter/death_alarm/Initialize(mapload)
. = ..()
imp = new /obj/item/implant/death_alarm(src)
implant_type = /obj/item/implant/death_alarm
/obj/item/implantcase/death_alarm
name = "Implant Case - 'Death Alarm'"
desc = "A case containing a death alarm implant."
/obj/item/implantcase/death_alarm/Initialize(mapload)
. = ..()
imp = new /obj/item/implant/death_alarm(src)
implant_type = /obj/item/implant/death_alarm
code/game/objects/items/weapons/implants/implant_dust.dm
+2 -8
View File
@@ -32,15 +32,9 @@
/obj/item/implanter/dust
name = "implanter (Dust-on-death)"
/obj/item/implanter/dust/Initialize(mapload)
. = ..()
imp = new /obj/item/implant/dust(src)
implant_type = /obj/item/implant/dust
/obj/item/implantcase/dust
name = "implant case - 'Dust'"
desc = "A glass case containing a dust implant."
/obj/item/implantcase/dust/Initialize(mapload)
. = ..()
imp = new /obj/item/implant/dust(src)
implant_type = /obj/item/implant/dust
code/game/objects/items/weapons/implants/implant_emp.dm
+2 -8
View File
@@ -15,15 +15,9 @@
/obj/item/implanter/emp
name = "implanter (EMP)"
/obj/item/implanter/emp/Initialize(mapload)
. = ..()
imp = new /obj/item/implant/emp(src)
implant_type = /obj/item/implant/emp
/obj/item/implantcase/emp
name = "implant case - 'EMP'"
desc = "A glass case containing an EMP implant."
/obj/item/implantcase/emp/Initialize(mapload)
. = ..()
imp = new /obj/item/implant/emp(src)
implant_type = /obj/item/implant/emp
code/game/objects/items/weapons/implants/implant_exile.dm
+2 -8
View File
@@ -10,18 +10,12 @@
/obj/item/implanter/exile
name = "implanter (exile)"
/obj/item/implanter/exile/Initialize(mapload)
. = ..()
imp = new /obj/item/implant/exile(src)
implant_type = /obj/item/implant/exile
/obj/item/implantcase/exile
name = "implant case - 'Exile'"
desc = "A glass case containing an exile implant."
/obj/item/implantcase/exile/Initialize(mapload)
. = ..()
imp = new /obj/item/implant/exile(src)
implant_type = /obj/item/implant/exile
/obj/structure/closet/secure_closet/exile
name = "exile implants"
code/game/objects/items/weapons/implants/implant_explosive.dm
+4 -16
View File
@@ -105,30 +105,18 @@
/obj/item/implanter/explosive
name = "implanter (explosive)"
/obj/item/implanter/explosive/Initialize(mapload)
. = ..()
imp = new /obj/item/implant/explosive(src)
implant_type = /obj/item/implant/explosive
/obj/item/implantcase/explosive
name = "implant case - 'Micro Explosive'"
desc = "A glass case containing a micro explosive implant."
/obj/item/implantcase/explosive/Initialize(mapload)
. = ..()
imp = new /obj/item/implant/explosive(src)
implant_type = /obj/item/implant/explosive
/obj/item/implanter/explosive_macro
name = "implanter (macro-explosive)"
/obj/item/implanter/explosive_macro/Initialize(mapload)
. = ..()
imp = new /obj/item/implant/explosive/macro(src)
implant_type = /obj/item/implant/explosive/macro
/obj/item/implantcase/explosive_macro
name = "implant case - 'Macro Explosive'"
desc = "A glass case containing a macro explosive implant."
/obj/item/implantcase/explosive_macro/Initialize(mapload)
. = ..()
imp = new /obj/item/implant/explosive/macro(src)
implant_type = /obj/item/implant/explosive/macro
code/game/objects/items/weapons/implants/implant_freedom.dm
+2 -8
View File
@@ -29,15 +29,9 @@
/obj/item/implanter/freedom
name = "implanter (freedom)"
/obj/item/implanter/freedom/Initialize(mapload)
. = ..()
imp = new /obj/item/implant/freedom(src)
implant_type = /obj/item/implant/freedom
/obj/item/implantcase/freedom
name = "implant case - 'Freedom'"
desc = "A glass case containing a freedom implant."
/obj/item/implantcase/freedom/Initialize(mapload)
. = ..()
imp = new /obj/item/implant/freedom(src)
implant_type = /obj/item/implant/freedom
code/game/objects/items/weapons/implants/implant_health.dm
+9
View File
@@ -12,3 +12,12 @@
else
healthstring = "[round(imp_in.getOxyLoss())] - [round(imp_in.getFireLoss())] - [round(imp_in.getToxLoss())] - [round(imp_in.getBruteLoss())]"
return healthstring
/obj/item/implanter/health
name = "implanter (health)"
implant_type = /obj/item/implant/health
/obj/item/implantcase/health
name = "implant case - 'Health'"
desc = "A glass case containing a health implant."
implant_type = /obj/item/implant/health
code/game/objects/items/weapons/implants/implant_krav_maga.dm
+2 -8
View File
@@ -21,15 +21,9 @@
/obj/item/implanter/krav_maga
name = "implanter (krav maga)"
/obj/item/implanter/krav_maga/Initialize(mapload)
. = ..()
imp = new /obj/item/implant/krav_maga(src)
implant_type = /obj/item/implant/krav_maga
/obj/item/implantcase/krav_maga
name = "implant case - 'Krav Maga'"
desc = "A glass case containing an implant that can teach the user the art of Krav Maga."
/obj/item/implantcase/krav_maga/Initialize(mapload)
. = ..()
imp = new /obj/item/implant/krav_maga(src)
implant_type = /obj/item/implant/krav_maga
code/game/objects/items/weapons/implants/implant_mindshield.dm
+2 -8
View File
@@ -28,15 +28,9 @@
/obj/item/implanter/mindshield
name = "implanter (mindshield)"
/obj/item/implanter/mindshield/Initialize(mapload)
. = ..()
imp = new /obj/item/implant/mindshield(src)
implant_type = /obj/item/implant/mindshield
/obj/item/implantcase/mindshield
name = "implant case - 'mindshield'"
desc = "A glass case containing a mindshield implant."
/obj/item/implantcase/mindshield/Initialize(mapload)
. = ..()
imp = new /obj/item/implant/mindshield(src)
implant_type = /obj/item/implant/mindshield
code/game/objects/items/weapons/implants/implant_sad_trombone.dm
+2 -8
View File
@@ -19,15 +19,9 @@
/obj/item/implanter/sad_trombone
name = "implanter (sad trombone)"
/obj/item/implanter/sad_trombone/Initialize(mapload)
. = ..()
imp = new /obj/item/implant/sad_trombone
implant_type = /obj/item/implant/sad_trombone
/obj/item/implantcase/sad_trombone
name = "implant case - 'Sad Trombone'"
desc = "A glass case containing a sad trombone implant."
/obj/item/implantcase/sad_trombone/Initialize(mapload)
. = ..()
imp = new /obj/item/implant/sad_trombone
implant_type = /obj/item/implant/sad_trombone
code/game/objects/items/weapons/implants/implant_storage.dm
+2 -8
View File
@@ -61,15 +61,9 @@
/obj/item/implanter/storage
name = "implanter (storage)"
/obj/item/implanter/storage/Initialize(mapload)
. = ..()
imp = new /obj/item/implant/storage(src)
implant_type = /obj/item/implant/storage
/obj/item/implantcase/storage
name = "implant case - 'Storage'"
desc = "A glass case containing a storage implant."
/obj/item/implantcase/storage/Initialize(mapload)
. = ..()
imp = new /obj/item/implant/storage(src)
implant_type = /obj/item/implant/storage
code/game/objects/items/weapons/implants/implant_tracking.dm
+2 -8
View File
@@ -17,15 +17,9 @@
/obj/item/implanter/tracking
name = "implanter (tracking)"
/obj/item/implanter/tracking/Initialize(mapload)
. = ..()
imp = new /obj/item/implant/tracking(src)
implant_type = /obj/item/implant/tracking
/obj/item/implantcase/tracking
name = "implant case - 'Tracking'"
desc = "A glass case containing a tracking implant."
/obj/item/implantcase/tracking/Initialize(mapload)
. = ..()
imp = new /obj/item/implant/tracking(src)
implant_type = /obj/item/implant/tracking
code/game/objects/items/weapons/implants/implant_traitor.dm
+2 -8
View File
@@ -49,15 +49,9 @@
/obj/item/implanter/traitor
name = "implanter (Mindslave)"
/obj/item/implanter/traitor/Initialize(mapload)
. = ..()
imp = new /obj/item/implant/traitor(src)
implant_type = /obj/item/implant/traitor
/obj/item/implantcase/traitor
name = "implant case - 'Mindslave'"
desc = "A glass case containing a mindslave implant."
/obj/item/implantcase/traitor/Initialize(mapload)
. = ..()
imp = new /obj/item/implant/traitor(src)
implant_type = /obj/item/implant/traitor
code/game/objects/items/weapons/implants/implant_uplink.dm
+22 -27
View File
@@ -12,6 +12,22 @@
hidden_uplink = new(src)
hidden_uplink.uses = 10
/obj/item/implant/uplink/nuclear/Initialize(mapload)
. = ..()
if(hidden_uplink)
hidden_uplink.update_uplink_type(UPLINK_TYPE_NUCLEAR)
/obj/item/implant/uplink/sit/Initialize(mapload)
. = ..()
if(hidden_uplink)
hidden_uplink.update_uplink_type(UPLINK_TYPE_SIT)
/obj/item/implant/uplink/admin/Initialize(mapload)
. = ..()
if(hidden_uplink)
hidden_uplink.update_uplink_type(UPLINK_TYPE_ADMIN)
/obj/item/implant/uplink/implant(mob/source)
var/obj/item/implant/imp_e = locate(type) in source
if(imp_e && imp_e != src)
@@ -30,38 +46,17 @@
/obj/item/implanter/uplink
name = "implanter (uplink)"
/obj/item/implanter/uplink/Initialize(mapload)
. = ..()
imp = new /obj/item/implant/uplink(src)
implant_type = /obj/item/implant/uplink
/obj/item/implantcase/uplink
name = "implant case - 'Syndicate Uplink'"
desc = "A glass case containing an uplink implant."
/obj/item/implantcase/uplink/Initialize(mapload)
. = ..()
imp = new /obj/item/implant/uplink(src)
/obj/item/implant/uplink/nuclear/Initialize(mapload)
. = ..()
if(hidden_uplink)
hidden_uplink.update_uplink_type(UPLINK_TYPE_NUCLEAR)
implant_type = /obj/item/implant/uplink
/obj/item/implanter/nuclear
name = "implanter (Nuclear Agent Uplink)"
implant_type = /obj/item/implant/uplink/nuclear
/obj/item/implanter/nuclear/Initialize(mapload)
. = ..()
imp = new /obj/item/implant/uplink/nuclear(src)
/obj/item/implant/uplink/sit/Initialize(mapload)
. = ..()
if(hidden_uplink)
hidden_uplink.update_uplink_type(UPLINK_TYPE_SIT)
/obj/item/implant/uplink/admin/Initialize(mapload)
. = ..()
if(hidden_uplink)
hidden_uplink.update_uplink_type(UPLINK_TYPE_ADMIN)
/obj/item/implantcase/nuclear
name = "implant case - 'Nuclear Agent Uplink'"
implant_type = /obj/item/implant/uplink/nuclear
code/game/objects/items/weapons/implants/implantcase.dm
+2
View File
@@ -12,9 +12,11 @@
materials = list(MAT_GLASS = 500)
var/obj/item/implant/imp
var/implant_type = /obj/item/implant
/obj/item/implantcase/Initialize(mapload)
. = ..()
imp = new implant_type(src)
update_state()
/obj/item/implantcase/Destroy()
code/game/objects/items/weapons/implants/implanter.dm
+4 -2
View File
@@ -11,6 +11,7 @@
materials = list(MAT_METAL = 600, MAT_GLASS = 200)
toolspeed = 1
var/obj/item/implant/imp
var/implant_type = /obj/item/implant
/obj/item/implanter/update_icon_state()
if(imp)
@@ -43,6 +44,7 @@
if(istype(W, /obj/item/pen))
rename_interactive(user, W)
/obj/item/implanter/New()
..()
/obj/item/implanter/Initialize(mapload)
. = ..()
imp = new implant_type()
update_icon(UPDATE_ICON_STATE)