cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 18:32:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'pomfrepo/Bleeding-Edge' into role_datums_rebasaroo

Browse Source 
# Conflicts:
#	code/modules/mob/living/living.dm
#	icons/obj/items.dmi
#	icons/obj/stationobjs.dmi
This commit is contained in:
madmanmartian
2018-09-25 10:36:47 +01:00
parent f71065d211 63f63add5f
commit 0f66b1995c
229 changed files with 2061 additions and 1583 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/admin/topic.dm
View File

@@ -4231,7 +4231,7 @@
options += name
options[name] = D
var/obj/docking_port/destination/choice = options[(input(usr,"Select a docking port to add to [S.name]","Admin abuse") in options)]
var/obj/docking_port/destination/choice = options[(input(usr,"Select a docking port to add to [S.name]","Admin abuse") as null|anything in options)]
if(!istype(choice))
return