cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-22 08:01:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Nuke disk fix, preferences fix, bay lore purge and more (#1523)

Browse Source 
-may fix #1493
-fix missing the nuke disk being deleted when put inside any container
-fix several references to bay lore, like nyx and etc
-add some missing splint related code
-added fireandglory's hammer weapon to uplink and heist
-tries to unfuck the designs.dm
This commit is contained in:
Alberyk
2017-01-12 19:03:40 -02:00
committed by skull132
parent ea7148443f
commit 858690a62b
13 changed files with 171 additions and 177 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/modules/client/preference_setup/general/04_equipment.dm
View File

@@ -94,15 +94,15 @@
return pref.gender == MALE ? socks_m : socks_f
/datum/category_item/player_setup_item/general/equipment/proc/valid_gear_choices(var/max_cost)
var/list/valid_gear_choices = list()
. = list()
var/mob/preference_mob = preference_mob()
for(var/gear_name in gear_datums)
var/datum/gear/G = gear_datums[gear_name]
if(G.whitelisted && !is_alien_whitelisted(preference_mob(), G.whitelisted))
if(G.whitelisted && !is_alien_whitelisted(preference_mob, G.whitelisted))
continue
if(max_cost && G.cost > max_cost)
continue
valid_gear_choices += gear_name
return valid_gear_choices
. += gear_name
/datum/category_item/player_setup_item/general/equipment/OnTopic(var/href,var/list/href_list, var/mob/user)
if(href_list["change_underwear"])