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

Merge pull request #529 from Markolie/master

Browse Source 
Makes NT Representative/Recruiter Karma locked again, SyndiBorg modtype fix
This commit is contained in:
Fox-McCloud
2014-11-26 17:32:42 -05:00
parent 23b4dca927 7dd1420f68
commit f7c0acb0e2
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/WorkInProgress/ZomgPonies/karma.dm
+2 -2
View File
@@ -155,8 +155,8 @@ You've gained <b>[totalkarma]</b> total karma in your time here.<br>"}
dat += {"
<a href='?src=\ref[src];karmashop=shop;KarmaBuy=1'>Unlock Barber -- 5KP</a><br>
<a href='?src=\ref[src];karmashop=shop;KarmaBuy=2'>Unlock Brig Physician -- 5KP</a><br>
<a href='?src=\ref[src];karmashop=shop;KarmaBuy=8'>Unlock Nanotrasen Recruiter -- 10KP</a><br>
<a href='?src=\ref[src];karmashop=shop;KarmaBuy=3'>Unlock Nanotrasen Representative -- 30KP</a><br>
<a href='?src=\ref[src];karmashop=shop;KarmaBuy=8'>Unlock NanoTrasen Recruiter -- 10KP</a><br>
<a href='?src=\ref[src];karmashop=shop;KarmaBuy=3'>Unlock NanoTrasen Representative -- 30KP</a><br>
<a href='?src=\ref[src];karmashop=shop;KarmaBuy=4'>Unlock Customs Officer -- 30P</a><br>
<a href='?src=\ref[src];karmashop=shop;KarmaBuy=5'>Unlock Blueshield -- 30KP</a><br>
<a href='?src=\ref[src];karmashop=shop;KarmaBuy=9'>Unlock Security Pod Pilot -- 30KP</a><br>
code/game/jobs/jobs.dm
+2 -2
View File
@@ -145,13 +145,13 @@ var/list/nonhuman_positions = list(
var/list/whitelisted_positions = list(
"Blueshield",
"Customs Officer",
"Nanotrasen Representative",
"NanoTrasen Representative",
"Barber",
"Mechanic",
"Brig Physician",
"Magistrate",
"Security Pod Pilot",
"Nanotrasen Recruiter"
"NanoTrasen Recruiter"
)
code/modules/mob/living/silicon/robot/robot.dm
+1
View File
@@ -1412,6 +1412,7 @@
modtype = "Synd"
faction = list("syndicate")
designation = "Syndicate"
modtype = "Syndicate"
req_access = list(access_syndicate)
/mob/living/silicon/robot/syndicate/New(loc)