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

Major map overhaul, remove customs officer/nanotrasen recruiter

Browse Source
This commit is contained in:
Markolie
2015-01-12 02:23:45 +01:00
parent 1c6c3a3be1
commit 60e18d0c0e
23 changed files with 13672 additions and 13933 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/client procs.dm
-14
View File
@@ -91,13 +91,6 @@
else
src.DB_job_unlock("Nanotrasen Representative",30)
return
if("4")
if(karma <30)
usr << "You do not have enough karma!"
return
else
src.DB_job_unlock("Customs Officer",30)
return
if("5")
if(karma <30)
usr << "You do not have enough karma!"
@@ -119,13 +112,6 @@
else
src.DB_job_unlock("Magistrate",45)
return
if("8")
if(karma <10)
usr << "You do not have enough karma!"
return
else
src.DB_job_unlock("Nanotrasen Recruiter",10)
return
if("9")
if(karma <30)
usr << "You do not have enough karma!"
code/modules/karma/karma.dm
+11 -3
View File
@@ -184,9 +184,7 @@ 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=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>
<a href='?src=\ref[src];karmashop=shop;KarmaBuy=6'>Unlock Mechanic -- 30KP</a><br>
@@ -228,7 +226,13 @@ You've gained <b>[totalkarma]</b> total karma in your time here.<br>"}
dat += "<a href='?src=\ref[src];karmashop=shop;KarmaRefund=Grey Ambassador;KarmaRefundType=job;KarmaRefundCost=30'>Refund Grey Ambassador -- 30KP</a><br>"
if("Vox Ambassador" in purchased)
refundable += "Vox Ambassador"
dat += "<a href='?src=\ref[src];karmashop=shop;KarmaRefund=Vox Ambassador;KarmaRefundType=job;KarmaRefundCost=30'>Refund Vox Ambassador -- 30KP</a><br>"
dat += "<a href='?src=\ref[src];karmashop=shop;KarmaRefund=Vox Ambassador;KarmaRefundType=job;KarmaRefundCost=30'>Refund Vox Ambassador -- 30KP</a><br>"
if("Customs Officer" in purchased)
refundable += "Customs Officer"
dat += "<a href='?src=\ref[src];karmashop=shop;KarmaRefund=Customs Officer;KarmaRefundType=job;KarmaRefundCost=30'>Refund Customs Officer -- 30KP</a><br>"
if("Nanotrasen Recruiter" in purchased)
refundable += "Nanotrasen Recruiter"
dat += "<a href='?src=\ref[src];karmashop=shop;KarmaRefund=Nanotrasen Recruiter;KarmaRefundType=job;KarmaRefundCost=10'>Refund Nanotrasen Recruiter -- 10KP</a><br>"
if(!refundable.len)
dat += "You do not have any refundable karma purchases.<br>"
@@ -359,6 +363,10 @@ You've gained <b>[totalkarma]</b> total karma in your time here.<br>"}
cost = 30
else if(name == "Vox Ambassador")
cost = 30
else if(name == "Customs Officer")
cost = 30
else if(name == "Nanotrasen Recruiter")
cost = 10
else
usr << "\red That job is not refundable."
return
code/modules/mob/living/simple_animal/simple_animal.dm
+1 -1
View File
@@ -159,7 +159,7 @@
if(Environment)
if( abs(Environment.temperature - bodytemperature) > 40 )
if( abs(Environment.temperature - bodytemperature) > 40 && !(flags & IS_SYNTHETIC))
bodytemperature += ((Environment.temperature - bodytemperature) / 5)
if(min_oxy)
code/modules/mob/new_player/preferences_setup.dm
-21
View File
@@ -711,17 +711,6 @@ datum/preferences
clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-eng"), ICON_OVERLAY)
if(4)
clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
if(CUSTOMS)
clothes_s = new /icon(uniform_dmi, "milohachert_s")
clothes_s.Blend(new /icon('icons/mob/feet.dmi', "jackboots"), ICON_UNDERLAY)
clothes_s.Blend(new /icon('icons/mob/head.dmi', "customshelm"), ICON_OVERLAY)
switch(backbag)
if(2)
clothes_s.Blend(new /icon('icons/mob/back.dmi', "securitypack"), ICON_OVERLAY)
if(3)
clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-sec"), ICON_OVERLAY)
if(4)
clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
if(PILOT)
clothes_s = new /icon(uniform_dmi, "secred_s")
clothes_s.Blend(new /icon('icons/mob/feet.dmi', "jackboots"), ICON_UNDERLAY)
@@ -754,16 +743,6 @@ datum/preferences
clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
if(4)
clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
if(NANOREC)
clothes_s = new /icon(uniform_dmi, "officer_s")
clothes_s.Blend(new /icon('icons/mob/feet.dmi', "laceups"), ICON_UNDERLAY)
switch(backbag)
if(2)
clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
if(3)
clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
if(4)
clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
if(BLUESHIELD)
clothes_s = new /icon(uniform_dmi, "officer_s")
clothes_s.Blend(new /icon('icons/mob/feet.dmi', "jackboots"), ICON_UNDERLAY)