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

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

Browse Source
This commit is contained in:
Aurorablade
2016-09-01 00:43:50 -04:00
parent d806d986ef 9bbd2b0037
commit 2c104adaf3
125 changed files with 410 additions and 290 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/datumvars.dm
+5 -5
View File
@@ -7,12 +7,12 @@
if(!usr.client || !usr.client.holder)
to_chat(usr, "\red You need to be an administrator to access this.")
to_chat(usr, "<span class='warning'>You need to be an administrator to access this.</span>")
return
var/title = ""
var/body = ""
var/list/body = list()
if(!D) return
if(istype(D, /atom))
@@ -319,7 +319,7 @@ body
}
</style>"}
html += "</head><body>"
html += body
html += body.Join("")
html += {"
<script type='text/javascript'>
@@ -335,7 +335,7 @@ body
return
/client/proc/debug_variable(name, value, level, var/datum/DA = null)
var/html = ""
var/list/html = list()
if(DA)
html += "<li style='backgroundColor:white'>(<a href='?_src_=vars;datumedit=\ref[DA];varnameedit=[name]'>E</a>) (<a href='?_src_=vars;datumchange=\ref[DA];varnamechange=[name]'>C</a>) (<a href='?_src_=vars;datummass=\ref[DA];varnamemass=[name]'>M</a>) "
@@ -414,7 +414,7 @@ body
*/
html += "</li>"
return html
return html.Join("")
/client/proc/view_var_Topic(href, href_list, hsrc)
//This should all be moved over to datum/admins/Topic() or something ~Carn
code/datums/helper_datums/map_template.dm
+4 -8
View File
@@ -53,14 +53,10 @@
if(!bounds)
return 0
if(bot_left == null || top_right == null)
log_debug("One of the late setup corners is bust")
else
log_debug("Late Setup from ([bot_left.x],[bot_left.y]) to ([top_right.x],[top_right.y])")
log_runtime(EXCEPTION("One of the late setup corners is bust"), src)
if(ST_bot_left == null || ST_top_right == null)
log_debug("One of the smoothing corners is bust")
else
log_debug("Tile smoothing from ([ST_bot_left.x],[ST_bot_left.y]) to ([ST_top_right.x],[ST_top_right.y])")
log_runtime(EXCEPTION("One of the smoothing corners is bust"), src)
late_setup_level(
block(bot_left, top_right),
@@ -77,7 +73,7 @@
. = file(mappath)
if(!.)
log_to_dd(" The file of [src] appears to be empty/non-existent.")
log_runtime(EXCEPTION(" The file of [src] appears to be empty/non-existent."), src)
/datum/map_template/proc/get_affected_turfs(turf/T, centered = 0)
var/turf/placement = T
@@ -155,4 +151,4 @@
var/datum/map_template/shelter/S = new shelter_type()
shelter_templates[S.shelter_id] = S
map_templates[S.shelter_id] = S
map_templates[S.shelter_id] = S
code/datums/mind.dm
+3 -3
View File
@@ -81,7 +81,7 @@
/datum/mind/proc/transfer_to(mob/living/new_character)
var/datum/atom_hud/antag/hud_to_transfer = antag_hud //we need this because leave_hud() will clear this list
if(!istype(new_character))
log_to_dd("## DEBUG: transfer_to(): Some idiot has tried to transfer_to() a non mob/living mob. Please inform Carn")
log_runtime(EXCEPTION("transfer_to(): Some idiot has tried to transfer_to() a non mob/living mob."), src)
if(current) //remove ourself from our old body's mind variable
current.mind = null
leave_all_huds() //leave all the huds in the old body, so it won't get huds if somebody else enters it
@@ -597,7 +597,7 @@
return
var/datum/mind/targ = new_target
if(!istype(targ))
log_debug("Invalid target for identity theft objective, cancelling")
log_runtime(EXCEPTION("Invalid target for identity theft objective, cancelling"), src)
return
new_objective = new /datum/objective/escape/escape_with_identity
new_objective.owner = src
@@ -1643,4 +1643,4 @@
/mob/living/simple_animal/construct/armoured/mind_initialize()
..()
mind.assigned_role = "Juggernaut"
mind.special_role = SPECIAL_ROLE_CULTIST
mind.special_role = SPECIAL_ROLE_CULTIST
code/datums/spells/summonitem.dm
+1 -1
View File
@@ -71,7 +71,7 @@
var/obj/item/brain/B = new /obj/item/brain(user.loc)
B.transfer_identity(C)
C.death()
add_logs(C, user, "magically debrained", addition="INTENT: [uppertext(user.a_intent)]")*/
add_logs(user, C, "magically debrained", addition="INTENT: [uppertext(user.a_intent)]")*/
if(C.stomach_contents && item_to_retrive in C.stomach_contents)
C.stomach_contents -= item_to_retrive