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

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

Browse Source 
# Conflicts:
#	code/game/machinery/recharger.dm
#	code/game/objects/items/devices/autopsy.dm
#	code/game/objects/items/devices/modkit.dm
#	code/game/objects/structures/lattice.dm
This commit is contained in:
Markolie
2017-04-14 18:15:12 +02:00
parent 2d1c04c112 e9156ef71b
commit d9653c79f5
280 changed files with 2179 additions and 1512 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/karma/karma.dm
+1 -3
View File
@@ -79,7 +79,7 @@ var/list/karma_spenders = list()
to_chat(src, "<span class='warning'>You can't spend karma on someone connected from the same IP.</span>")
return 0
return 1
/mob/verb/spend_karma_list()
set name = "Award Karma"
@@ -118,8 +118,6 @@ var/list/karma_spenders = list()
if(!M)
to_chat(usr, "Please right click a mob to award karma directly, or use the 'Award Karma' verb to select a player from the player listing.")
return
if(!can_give_karma_to_mob(M))
return
if(alert("Give [M.name] good karma?", "Karma", "Yes", "No") != "Yes")
return
if(!can_give_karma_to_mob(M))