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

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise

Browse Source 
Conflicts:
	maps/cyberiad.dmm
This commit is contained in:
Markolie
2014-12-23 02:50:14 +01:00
parent 4798579e59 d758f9c2b5
commit 3f77f3ba42
3 changed files with 13566 additions and 13565 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/response_team.dm
+1 -1
View File
@@ -304,7 +304,7 @@ proc/trigger_armed_response_team(var/force = 0)
var/obj/item/device/pda/heads/pda = new(src)
pda.owner = real_name
pda.ownjob = "Emergency Response Team[leader_selected ? " Leader" : ""]"
pda.name = "PDA-[M.real_name] ([pda.ownjob])
pda.name = "PDA-[real_name] ([pda.ownjob])"
if (leader_selected)
W.access += access_cent_teleporter
code/modules/admin/verbs/debug.dm
+1 -1
View File
@@ -814,7 +814,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
M.equip_if_possible(new /obj/item/clothing/gloves/white(M), slot_gloves)
M.equip_if_possible(new /obj/item/device/radio/headset/heads/hop(M), slot_l_ear)
var/obj/item/device/pda/ntrep/pda = new(M)
var/obj/item/device/pda/heads/ntrep/pda = new(M)
pda.owner = M.real_name
pda.ownjob = "Nanotrasen Navy Representative"
pda.name = "PDA-[M.real_name] ([pda.ownjob])"