cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-01-30 19:03:05 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
5967bb6dc5030ae989f86f734b946762591cb868
VOREStation/code/modules
History
Arokha Sieyes 5967bb6dc5 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync 
# Conflicts:
#	code/game/objects/items/weapons/storage/boxes.dm
#	code/game/objects/items/weapons/storage/storage.dm
#	code/modules/mob/living/carbon/human/species/species.dm
#	html/changelogs/.all_changelog.yml
#	maps/southern_cross/southern_cross-6.dmm
2018-02-18 00:25:36 -06:00
..
admin
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-16
2018-02-17 00:35:29 -05:00
alarm
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-16
2018-02-17 00:35:29 -05:00
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 pull request #3058 from VOREStation/aro-joinspeed
2018-02-17 23:41:05 -06:00
clothing
VOREStation Specific Merge Changes
2018-02-17 16:56:31 -05:00
customitems
…
detectivework
…
economy
…
entopics_vr
…
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
Make light switches constructable
2018-02-14 21:26:00 -05:00
ext_scripts
…
flufftext
…
food
…
gamemaster
…
games
Merge remote-tracking branch 'upstream-polaris/master' into polaris-sync-2018-02-07
2018-02-07 19:30:50 -05:00
genetics
…
ghosttrap
…
holodeck
…
holomap
…
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 branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-16
2018-02-17 00:35:29 -05:00
maps
Update every initialize() proc to return an initialize hint.
2018-02-05 15:50:13 -05:00
materials
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-16
2018-02-17 00:35:29 -05:00
media
…
metric
…
mining
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync
2018-02-18 00:25:36 -06:00
mob
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync
2018-02-18 00:25:36 -06:00
multiz
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-16
2018-02-17 00:35:29 -05:00
nano
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync
2018-02-18 00:25:36 -06:00
nifsoft
Fixes #2810
2018-02-15 03:42:49 -06:00
organs
VOREStation Specific Merge Changes
2018-02-17 16:56:31 -05:00
overmap
Update every initialize() proc to return an initialize hint.
2018-02-05 15:50:13 -05:00
paperwork
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-16
2018-02-17 00:35:29 -05:00
planet
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-16
2018-02-17 00:35:29 -05:00
power
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-16
2018-02-17 00:35:29 -05:00
projectiles
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync
2018-02-18 00:25:36 -06:00
random_map
…
reagents
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync
2018-02-18 00:25:36 -06:00
recycling
…
research
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-16
2018-02-17 00:35:29 -05:00
resleeving
…
rogueminer_vr
VOREStation updates related to merged changes from polaris.
2018-02-07 20:08:10 -05:00
scripting
…
security levels
…
shieldgen
Tweaks Shield Generators
2018-02-08 05:37:56 -05:00
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
…
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 branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-16
2018-02-17 00:35:29 -05:00
vore
Fix same-size mobs walking on each other and being unable to bump doors.
2018-02-17 22:44:12 -05:00
xenoarcheaology
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-16
2018-02-17 00:35:29 -05:00
xenobio
Gun changes (#4185)
2018-02-12 23:12:14 -08:00
xenobio2
…
xgm
…