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

Bug fixes, map fixes

Browse Source
This commit is contained in:
Markolie
2014-12-22 14:47:58 +01:00
parent 37aa0254fc
commit 47f4161fbb
12 changed files with 442 additions and 398 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/karma/karma.dm
+46 -8
View File
@@ -201,9 +201,33 @@ You've gained <b>[totalkarma]</b> total karma in your time here.<br>"}
if (2) // Karma Refunds
var/list/refundable = list()
/*if(checkpurchased("Barber"))
refundable += "Barber"
dat += "<a href='?src=\ref[src];karmashop=shop;KarmaRefund=Barber;KarmaRefundType=job;KarmaRefundCost=5'>Refund Barber -- 5KP</a><br>"*/
if(checkpurchased("Tajaran Ambassador"))
refundable += "Tajaran Ambassador"
dat += "<a href='?src=\ref[src];karmashop=shop;KarmaRefund=Tajaran Ambassador;KarmaRefundType=job;KarmaRefundCost=30'>Refund Tajaran Ambassador -- 30KP</a><br>"
if(checkpurchased("Unathi Ambassador"))
refundable += "Unathi Ambassador"
dat += "<a href='?src=\ref[src];karmashop=shop;KarmaRefund=Unathi Ambassador;KarmaRefundType=job;KarmaRefundCost=30'>Refund Unathi Ambassador -- 30KP</a><br>"
if(checkpurchased("Skrell Ambassador"))
refundable += "Skrell Ambassador"
dat += "<a href='?src=\ref[src];karmashop=shop;KarmaRefund=Skrell Ambassador;KarmaRefundType=job;KarmaRefundCost=30'>Refund Skrell Ambassador -- 30KP</a><br>"
if(checkpurchased("Diona Ambassador"))
refundable += "Diona Ambassador"
dat += "<a href='?src=\ref[src];karmashop=shop;KarmaRefund=Diona Ambassador;KarmaRefundType=job;KarmaRefundCost=30'>Refund Diona Ambassador -- 30KP</a><br>"
if(checkpurchased("Kidan Ambassador"))
refundable += "Kidan Ambassador"
dat += "<a href='?src=\ref[src];karmashop=shop;KarmaRefund=Kidan Ambassador;KarmaRefundType=job;KarmaRefundCost=30'>Refund Kidan Ambassador -- 30KP</a><br>"
if(checkpurchased("Kidan Ambassador"))
refundable += "Kidan Ambassador"
dat += "<a href='?src=\ref[src];karmashop=shop;KarmaRefund=Kidan Ambassador;KarmaRefundType=job;KarmaRefundCost=30'>Refund Kidan Ambassador -- 30KP</a><br>"
if(checkpurchased("Slime People Ambassador"))
refundable += "Slime People Ambassador"
dat += "<a href='?src=\ref[src];karmashop=shop;KarmaRefund=Slime People Ambassador;KarmaRefundType=job;KarmaRefundCost=30'>Refund Slime People Ambassador -- 30KP</a><br>"
if(checkpurchased("Grey Ambassador"))
refundable += "Grey Ambassador"
dat += "<a href='?src=\ref[src];karmashop=shop;KarmaRefund=Grey Ambassador;KarmaRefundType=job;KarmaRefundCost=30'>Refund Grey Ambassador -- 30KP</a><br>"
if(checkpurchased("Vox Ambassador"))
refundable += "Vox Ambassador"
dat += "<a href='?src=\ref[src];karmashop=shop;KarmaRefund=Vox Ambassador;KarmaRefundType=job;KarmaRefundCost=30'>Refund Vox Ambassador -- 30KP</a><br>"
if(!refundable.len)
dat += "You do not have any refundable karma purchases.<br>"
@@ -318,11 +342,25 @@ You've gained <b>[totalkarma]</b> total karma in your time here.<br>"}
return
/client/proc/karmarefund(var/type,var/name,var/cost)
/*if(name == "Barber")
cost = 5
else*/
usr << "\red That job is not refundable."
return
if(name == "Tajaran Ambassador")
cost = 30
else if(name == "Unathi Ambassador")
cost = 30
else if(name == "Skrell Ambassador")
cost = 30
else if(name == "Diona Ambassador")
cost = 30
else if(name == "Kidan Ambassador")
cost = 30
else if(name == "Slime People Ambassador")
cost = 30
else if(name == "Grey Ambassador")
cost = 30
else if(name == "Vox Ambassador")
cost = 30
else
usr << "\red That job is not refundable."
return
var/DBQuery/query = dbcon.NewQuery("SELECT * FROM whitelist WHERE ckey='[usr.key]'")
query.Execute()
code/modules/mob/living/carbon/human/human.dm
-4
View File
@@ -1605,10 +1605,6 @@
if(istype(idcard, /obj/item/weapon/card/id/syndicate))
threatcount -= 5
// Pingsky now actually harbors anti-human sentiment! -Dave
if(istype(judgebot, /obj/machinery/bot/secbot/pingsky) && istype(src, /mob/living/carbon/human/human/))
threatcount += 1
return threatcount
/mob/living/carbon/human/canBeHandcuffed()
code/modules/mob/living/silicon/say.dm
+1 -1
View File
@@ -83,7 +83,7 @@
if (!message)
return
var/obj/machinery/hologram/holopad/T = src.current
var/obj/machinery/hologram/holopad/T = src.holo
if(istype(T) && T.hologram && T.master == src)//If there is a hologram and its master is the user.
var/message_a = say_quote(message)
code/modules/shuttles/departmental.dm
+5 -5
View File
@@ -1,28 +1,28 @@
/obj/machinery/computer/shuttle_control/mining
name = "mining shuttle console"
name = "Mining Shuttle Console"
shuttle_tag = "Mining"
req_access = list(access_mining)
circuit = /obj/item/weapon/circuitboard/mining_shuttle
/obj/machinery/computer/shuttle_control/engineering
name = "engineering shuttle console"
name = "Engineering Shuttle Console"
shuttle_tag = "Engineering"
req_one_access_txt = "10;24"
circuit = /obj/item/weapon/circuitboard/engineering_shuttle
/obj/machinery/computer/shuttle_control/research
name = "research shuttle console"
name = "Research Shuttle Console"
shuttle_tag = "Research"
req_access = list(access_xenoarch)
circuit = /obj/item/weapon/circuitboard/research_shuttle
/obj/machinery/computer/shuttle_control/labor_camp
name = "labor camp shuttle console"
name = "Labor Camp Shuttle Console"
shuttle_tag = "Labor"
req_access = list(access_brig)
/obj/machinery/computer/shuttle_control/labor_camp/one_way
name = "prisoner shuttle console"
name = "Prisoner Shuttle Console"
req_access = list()
/obj/machinery/computer/shuttle_control/labor_camp/one_way/launch()