cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/dev' into 150817-SynthAccess

Browse Source 
Conflicts:
	code/game/objects/items/weapons/cards_ids.dm
This commit is contained in:
PsiOmegaDelta
2015-08-20 12:42:51 +02:00
parent c2e2252342 c8b6813426
commit c346b99371
56 changed files with 869 additions and 419 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/nano/modules/human_appearance.dm
View File

@@ -17,7 +17,7 @@
src.whitelist = species_whitelist
src.blacklist = species_blacklist
/datum/nano_module/appearance_changer/Topic(ref, href_list, var/nowindow, var/datum/topic_state/state = default_state)
/datum/nano_module/appearance_changer/Topic(ref, href_list, var/datum/topic_state/state = default_state)
if(..())
return 1

2
code/modules/nano/nanoui.dm
View File

@@ -479,7 +479,7 @@ nanoui is used to open and update nano browser uis
set_map_z_level(text2num(href_list["mapZLevel"]))
map_update = 1
if ((src_object && src_object.Topic(href, href_list, 0, state)) || map_update)
if ((src_object && src_object.Topic(href, href_list, state)) || map_update)
nanomanager.update_uis(src_object) // update all UIs attached to src_object
/**