cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 19:47:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Syndicate borg update, add medical syndicate borg, energy sword refactor

Browse Source
This commit is contained in:
Markolie
2015-10-01 04:21:24 +02:00
parent 700baff0ff
commit d18b18b5b4
33 changed files with 445 additions and 419 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/datumvars.dm
+1 -1
View File
@@ -612,7 +612,7 @@ client
M << "Control of your mob has been offered to dead players."
log_admin("[key_name(usr)] has offered control of ([key_name(M)]) to ghosts.")
message_admins("[key_name_admin(usr)] has offered control of ([key_name_admin(M)]) to ghosts")
var/list/mob/dead/observer/candidates = pollCandidates("Do you want to play as [M.real_name]?", "Player Control", null, FALSE, 100)
var/list/mob/dead/observer/candidates = pollCandidates("Do you want to play as [M.real_name]?", poll_time = 100)
var/mob/dead/observer/theghost = null
if(candidates.len)
code/datums/uplink_item.dm
+1 -1
View File
@@ -307,7 +307,7 @@ var/list/uplink_items = list()
name = "Energy Sword"
desc = "The energy sword is an edged weapon with a blade of pure energy. The sword is small enough to be pocketed when inactive. Activating it produces a loud, distinctive noise."
reference = "ES"
item = /obj/item/weapon/melee/energy/sword
item = /obj/item/weapon/melee/energy/sword/saber
cost = 8
/datum/uplink_item/dangerous/chainsaw