mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-19 19:13:30 +01:00
Adds a dummy process() to /obj/machinery/door so that doors aren't removed from the machine list. Best guess, all machines call process automatically, and because doors didn't have an explicit one defined, they automatically called the one that removed them from the list.
Adds a borg deathsquad to the map. Few more fixes to the tensioner. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3374 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
@@ -241,6 +241,7 @@
|
||||
<a href='?src=\ref[tension_master];makeSpaceNinja=1'>Make Space Ninja (Requires Ghosts)</a><br>
|
||||
<a href='?src=\ref[tension_master];makeAliens=1'>Make Aliens (Requires Ghosts)</a><br>
|
||||
<a href='?src=\ref[tension_master];makeDeathsquad=1'>Make Deathsquad (Syndicate) (Requires Ghosts)</a><br>
|
||||
<a href='?src=\ref[tension_master];makeBorgDeathsquad=1'>Make Deathsquad (Borg) (Requires Ghosts)</a><br>
|
||||
|
||||
"}
|
||||
usr << browse(output,"window=tensionreport")
|
||||
|
||||
@@ -12,20 +12,32 @@
|
||||
if(real_name == "Cyborg")
|
||||
real_name += " [pick(rand(1, 999))]"
|
||||
name = real_name
|
||||
|
||||
spawn (4)
|
||||
if (client)
|
||||
connected_ai = activeais()
|
||||
if (connected_ai)
|
||||
connected_ai.connected_robots += src
|
||||
// laws = connected_ai.laws //The borg inherits its AI's laws
|
||||
laws = new /datum/ai_laws
|
||||
lawsync()
|
||||
src << "<b>Unit slaved to [connected_ai.name], downloading laws.</b>"
|
||||
lawupdate = 1
|
||||
if(!syndie)
|
||||
if (client)
|
||||
connected_ai = activeais()
|
||||
if (connected_ai)
|
||||
connected_ai.connected_robots += src
|
||||
// laws = connected_ai.laws //The borg inherits its AI's laws
|
||||
laws = new /datum/ai_laws
|
||||
lawsync()
|
||||
src << "<b>Unit slaved to [connected_ai.name], downloading laws.</b>"
|
||||
lawupdate = 1
|
||||
else
|
||||
laws = new /datum/ai_laws/asimov
|
||||
lawupdate = 0
|
||||
src << "<b>Unable to locate an AI, reverting to standard Asimov laws.</b>"
|
||||
else
|
||||
laws = new /datum/ai_laws/asimov
|
||||
laws = new /datum/ai_laws/antimov
|
||||
lawupdate = 0
|
||||
src << "<b>Unable to locate an AI, reverting to standard Asimov laws.</b>"
|
||||
scrambledcodes = 1
|
||||
src << "Follow your laws."
|
||||
cell.charge = 25000
|
||||
module = new /obj/item/weapon/robot_module/syndicate(src)
|
||||
hands.icon_state = "standard"
|
||||
icon_state = "secborg"
|
||||
modtype = "Synd"
|
||||
|
||||
radio = new /obj/item/device/radio(src)
|
||||
camera = new /obj/machinery/camera(src)
|
||||
|
||||
@@ -228,5 +228,8 @@
|
||||
|
||||
|
||||
New()
|
||||
src.modules += new /obj/item/weapon/melee/energy/sword(src)
|
||||
src.modules += new /obj/item/weapon/gun/energy/pulse_rifle/destroyer(src)
|
||||
src.modules += new /obj/item/weapon/card/emag(src)
|
||||
src.modules += new /obj/item/weapon/tank/jetpack/oxygen(src)
|
||||
return
|
||||
|
||||
Reference in New Issue
Block a user