cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-24 21:40:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

removes secborgs (#6733)

Browse Source 
The evil will finally be defeated.
This takes security borgs out of the game entirely. They bring pretty much nothing to the table, in terms of either roleplay or positive influence to the station.
Also, combat and syndicate modules now have cuffs.
This commit is contained in:
ParadoxSpace
2019-08-17 19:23:11 +03:00
committed by Erki
parent 2da84b2f41
commit a7ff20218a
9 changed files with 44 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/silicon/robot/emote.dm
-18
View File
@@ -185,24 +185,6 @@
playsound(src.loc, 'sound/machines/buzz-sigh.ogg', 50, 0)
m_type = 1
if("law")
if (istype(module,/obj/item/weapon/robot_module/security))
message = "shows its legal authorization barcode."
playsound(src.loc, 'sound/voice/biamthelaw.ogg', 50, 0)
m_type = 2
else
to_chat(src, "You are not THE LAW, pal.")
if("halt")
if (istype(module,/obj/item/weapon/robot_module/security))
message = "'s speakers skreech, \"Halt! Security!\"."
playsound(src.loc, 'sound/voice/halt.ogg', 50, 0)
m_type = 2
else
to_chat(src, "You are not security.")
if ("help")
to_chat(src, "salute, bow-(none)/mob, clap, flap, aflap, twitch, twitch_s, nod, deathgasp, glare-(none)/mob, stare-(none)/mob, look, beep, ping, \nbuzz, law, halt")
else
code/modules/mob/living/silicon/robot/robot.dm
-16
View File
@@ -411,14 +411,6 @@
if(!R)
return
if(!overclocked)
//Give them some taser speed if they have a taser.
var/obj/item/weapon/gun/energy/taser/mounted/cyborg/T = locate() in R.module
if(!T)
T = locate() in module.contents
if(!T)
T = locate() in module.modules
if(T)
T.recharge_time = max(2 , T.recharge_time - 4)
//Give them the hacked item if they don't have it.
if(!emagged)
R.emagged = 1
@@ -430,14 +422,6 @@
if(!cell_emp_mult < 2)
cell_emp_mult = 1
if(overclocked)
//Reduce their free taser speed.
var/obj/item/weapon/gun/energy/taser/mounted/cyborg/T = locate() in R.module
if(!T)
T = locate() in module.contents
if(!T)
T = locate() in module.modules
if(T)
T.recharge_time = max(2 , T.recharge_time + 4)
//Show them on the robotics console.
if(scrambledcodes)
scrambledcodes = 0
code/modules/mob/living/silicon/robot/robot_modules.dm
+2 -55
View File
@@ -5,7 +5,6 @@ var/global/list/robot_modules = list(
"Mining" = /obj/item/weapon/robot_module/miner,
"Rescue" = /obj/item/weapon/robot_module/medical/rescue,
"Medical" = /obj/item/weapon/robot_module/medical/general,
"Security" = /obj/item/weapon/robot_module/security/general,
"Combat" = /obj/item/weapon/robot_module/combat,
"Engineering" = /obj/item/weapon/robot_module/engineering/general,
"Construction" = /obj/item/weapon/robot_module/engineering/construction,
@@ -501,52 +500,6 @@ var/global/list/robot_modules = list(
FTD.synths = list(plasteel)
src.modules += FTD
/obj/item/weapon/robot_module/security
name = "security robot module"
channels = list("Security" = 1)
networks = list(NETWORK_SECURITY)
subsystems = list(/mob/living/silicon/proc/subsystem_crew_monitor)
can_be_pushed = 0
supported_upgrades = list(/obj/item/borg/upgrade/tasercooler,/obj/item/robot_parts/robot_component/jetpack)
/obj/item/weapon/robot_module/security/general
sprites = list(
"Basic" = "robotsecy",
"Sleek" = "sleeksecurity",
"Black Knight" = "securityrobot",
"Bloodhound" = "bloodhound",
"Bloodhound - Treaded" = "treadhound",
"Drone" = "drone-sec",
"Classic" = "secborg",
"Spider" = "spidersec",
"Heavy" = "heavysec"
)
/obj/item/weapon/robot_module/security/general/New()
..()
src.modules += new /obj/item/weapon/crowbar(src)
src.modules += new /obj/item/device/flash(src)
src.modules += new /obj/item/borg/sight/hud/sec(src)
src.modules += new /obj/item/weapon/handcuffs/cyborg(src)
src.modules += new /obj/item/weapon/melee/baton/robot(src)
src.modules += new /obj/item/weapon/gun/energy/taser/mounted/cyborg(src)
src.modules += new /obj/item/taperoll/police(src)
src.modules += new /obj/item/device/holowarrant(src)
src.modules += new /obj/item/weapon/book/manual/security_space_law(src) // book of security space law
src.emag = new /obj/item/weapon/gun/energy/laser/mounted(src)
/obj/item/weapon/robot_module/security/respawn_consumable(var/mob/living/silicon/robot/R, var/amount)
..()
var/obj/item/weapon/gun/energy/taser/mounted/cyborg/T = locate() in src.modules
if(T.power_supply.charge < T.power_supply.maxcharge)
T.power_supply.give(T.charge_cost * amount)
T.update_icon()
else
T.charge_tick = 0
var/obj/item/weapon/melee/baton/robot/B = locate() in src.modules
if(B && B.bcell)
B.bcell.give(amount)
/obj/item/weapon/robot_module/janitor
name = "custodial robot module"
channels = list("Service" = 1)
@@ -793,6 +746,7 @@ var/global/list/robot_modules = list(
src.modules += new /obj/item/weapon/gun/launcher/grenade/cyborg(src)
src.modules += new /obj/item/weapon/crowbar(src)
src.modules += new /obj/item/weapon/robot_emag(src)
src.modules += new /obj/item/weapon/handcuffs/cyborg(src)
supported_upgrades = list(/obj/item/robot_parts/robot_component/jetpack)
return
@@ -814,6 +768,7 @@ var/global/list/robot_modules = list(
src.modules += new /obj/item/weapon/melee/hammer/powered(src)
src.modules += new /obj/item/borg/combat/shield(src)
src.modules += new /obj/item/borg/combat/mobility(src)
src.modules += new /obj/item/weapon/handcuffs/cyborg(src)
src.modules += new /obj/item/weapon/crowbar(src)
src.emag = new /obj/item/weapon/gun/energy/lasercannon/mounted(src)
@@ -1102,8 +1057,6 @@ var/global/list/robot_modules = list(
// Security
src.modules += new /obj/item/weapon/handcuffs/cyborg(src)
src.modules += new /obj/item/weapon/melee/baton/robot(src)
src.modules += new /obj/item/weapon/gun/energy/taser/mounted/cyborg/overclocked(src)
src.modules += new /obj/item/weapon/gun/energy/laser/mounted/cyborg/overclocked(src)
src.modules += new /obj/item/weapon/melee/hammer/powered(src)
src.modules += new /obj/item/weapon/gun/energy/lasercannon/mounted/cyborg/overclocked(src)
src.modules += new /obj/item/borg/combat/shield(src)
@@ -1172,12 +1125,6 @@ var/global/list/robot_modules = list(
/obj/item/weapon/robot_module/bluespace/respawn_consumable(var/mob/living/silicon/robot/R, var/amount)
..()
var/obj/item/weapon/gun/energy/taser/mounted/cyborg/T = locate() in src.modules
if(T.power_supply.charge < T.power_supply.maxcharge)
T.power_supply.give(T.charge_cost * amount)
T.update_icon()
else
T.charge_tick = 0
var/obj/item/weapon/melee/baton/robot/B = locate() in src.modules
if(B && B.bcell)
B.bcell.give(amount)