cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-01-29 10:21:52 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
1d0f5262d886901e4d300bf997fdf555e47aad28
VOREStation/code/modules
History
Leshana 1d0f5262d8 Merge remote-tracking branch 'upstream-polaris/master' into polaris-sync-2018-02-07 
# Conflicts:
#	code/__defines/subsystems.dm
#	code/controllers/master_controller.dm
#	code/controllers/subsystems/atoms.dm
#	code/game/machinery/Sleeper.dm
#	code/game/machinery/doors/airlock.dm
#	code/game/machinery/vr_console.dm
#	code/game/objects/items/devices/communicator/phone.dm
#	code/game/turfs/flooring/flooring_decals.dm
#	code/modules/admin/admin_verbs.dm
#	code/modules/mob/living/carbon/carbon.dm
#	code/modules/multiz/movement.dm
#	code/modules/projectiles/gun.dm
#	code/modules/shuttles/shuttle.dm
#	code/modules/shuttles/shuttles_web.dm
#	icons/obj/doors/doormed.dmi
#	maps/southern_cross/items/headset_sc.dm
#	maps/southern_cross/southern_cross-3.dmm
#	vorestation.dme
2018-02-07 19:30:50 -05:00
..
admin
Merge remote-tracking branch 'upstream-polaris/master' into polaris-sync-2018-02-07
2018-02-07 19:30:50 -05:00
alarm
…
assembly
…
awaymissions
Update every initialize() proc to return an initialize hint.
2018-02-05 15:50:13 -05:00
blob
…
blob2
…
busy_space
…
client
Merge remote-tracking branch 'upstream-polaris/master' into polaris-sync-2018-02-07
2018-02-07 19:30:50 -05:00
clothing
Merge remote-tracking branch 'upstream-polaris/master' into polaris-sync-2018-02-07
2018-02-07 19:30:50 -05:00
customitems
Allows modkits to be created for any item. (#4450)
2018-01-19 18:11:28 -08:00
detectivework
…
economy
Food and Drink: Additions and Bugfixes (#4598)
2018-01-21 22:18:33 -08:00
entopics_vr
VS: AR Entopics and Soulcatcher projecting (+Worldbender)
2018-01-20 23:29:24 -05:00
error_handler
…
events
Merge remote-tracking branch 'upstream-polaris/master' into polaris-sync-2018-02-07
2018-02-07 19:30:50 -05:00
examine
…
ext_scripts
…
flufftext
…
food
Merge remote-tracking branch 'upstream-polaris/master' into polaris-sync-2018-01-27
2018-01-27 23:08:53 -05:00
gamemaster
…
games
Merge remote-tracking branch 'upstream-polaris/master' into polaris-sync-2018-02-07
2018-02-07 19:30:50 -05:00
genetics
Replaces most of the gender macros. (#4681)
2018-02-03 14:40:09 -06:00
ghosttrap
…
holodeck
…
holomap
Initialize procs for virgo
2018-02-03 01:00:57 -05:00
hydroponics
Update every initialize() proc to return an initialize hint.
2018-02-05 15:50:13 -05:00
icon generation
…
integrated_electronics
Update every initialize() proc to return an initialize hint.
2018-02-05 15:50:13 -05:00
library
Update every initialize() proc to return an initialize hint.
2018-02-05 15:50:13 -05:00
lighting
Implement SSatoms
2018-02-05 15:50:06 -05:00
lore_codex
Merge remote-tracking branch 'upstream-polaris/master' into polaris-sync-2018-02-07
2018-02-07 19:30:50 -05:00
maps
Update every initialize() proc to return an initialize hint.
2018-02-05 15:50:13 -05:00
materials
Merge remote-tracking branch 'upstream-polaris/master' into polaris-sync-2018-02-07
2018-02-07 19:30:50 -05:00
media
Initialize procs for virgo
2018-02-03 01:00:57 -05:00
metric
…
mining
Update every initialize() proc to return an initialize hint.
2018-02-05 15:50:13 -05:00
mob
Merge remote-tracking branch 'upstream-polaris/master' into polaris-sync-2018-02-07
2018-02-07 19:30:50 -05:00
multiz
Merge remote-tracking branch 'upstream-polaris/master' into polaris-sync-2018-02-07
2018-02-07 19:30:50 -05:00
nano
…
nifsoft
Removes several ways to know every language
2018-02-04 13:03:49 -05:00
organs
Merge remote-tracking branch 'upstream-polaris/master' into polaris-sync-2018-02-07
2018-02-07 19:30:50 -05:00
overmap
Update every initialize() proc to return an initialize hint.
2018-02-05 15:50:13 -05:00
paperwork
Merge remote-tracking branch 'upstream-polaris/master' into polaris-sync-2018-02-07
2018-02-07 19:30:50 -05:00
planet
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-01
2018-02-01 23:55:47 -05:00
power
Merge remote-tracking branch 'upstream-polaris/master' into polaris-sync-2018-02-07
2018-02-07 19:30:50 -05:00
projectiles
Merge remote-tracking branch 'upstream-polaris/master' into polaris-sync-2018-02-07
2018-02-07 19:30:50 -05:00
random_map
…
reagents
Merge remote-tracking branch 'upstream-polaris/master' into polaris-sync-2018-02-07
2018-02-07 19:30:50 -05:00
recycling
…
research
Merge remote-tracking branch 'upstream-polaris/master' into polaris-sync-2018-02-07
2018-02-07 19:30:50 -05:00
resleeving
Initialize procs for virgo
2018-02-03 01:00:57 -05:00
rogueminer_vr
Initialize procs for virgo
2018-02-03 01:00:57 -05:00
scripting
…
security levels
…
shieldgen
…
shuttles
Should fix #4740.
2018-02-06 11:28:26 -06:00
spells
…
surgery
Merge remote-tracking branch 'upstream-polaris/master' into polaris-sync-2018-02-07
2018-02-07 19:30:50 -05:00
tables
Update every initialize() proc to return an initialize hint.
2018-02-05 15:50:13 -05:00
telesci
Initialize procs for virgo
2018-02-03 01:00:57 -05:00
tension
…
turbolift
Update every initialize() proc to return an initialize hint.
2018-02-05 15:50:13 -05:00
vehicles
Update every initialize() proc to return an initialize hint.
2018-02-05 15:50:13 -05:00
ventcrawl
…
virus2
Merge remote-tracking branch 'upstream-polaris/master' into polaris-sync-2018-02-07
2018-02-07 19:30:50 -05:00
vore
Merge pull request #2978 from VOREStation/context-menu
2018-02-05 10:13:46 -05:00
xenoarcheaology
Merge remote-tracking branch 'upstream-polaris/master' into polaris-sync-2018-02-07
2018-02-07 19:30:50 -05:00
xenobio
Fixes #4596
2018-02-03 14:31:38 -05:00
xenobio2
Merge remote-tracking branch 'upstream-polaris/master' into polaris-sync-2018-01-27
2018-01-27 23:08:53 -05:00
xgm
…