cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-03 05:52:43 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
aea1eee61535575b133bdfc72c9faeb2da0b5240
CHOMPStation2/code/modules
History
Kelshark aea1eee615 Merge branch 'master' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	code/game/area/Away Mission areas.dm
#	code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm
#	config/custom_items.txt
2018-02-21 22:19:24 -05:00
..
admin
Merge branch 'master' of https://github.com/VOREStation/VOREStation
2018-02-21 22:19:24 -05:00
alarm
…
assembly
…
awaymissions
Update every initialize() proc to return an initialize hint.
2018-02-05 15:50:13 -05:00
blob
…
blob2
Fixes Blob Tasering
2018-01-17 14:19:40 -05:00
busy_space
…
client
Merge branch 'master' of https://github.com/VOREStation/VOREStation
2018-02-21 22:19:24 -05:00
clothing
Merge branch 'master' of https://github.com/VOREStation/VOREStation
2018-02-21 22:19:24 -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
Planes Framework (#4545)
2018-01-17 13:45:54 -06:00
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
interserver shipping
…
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
Merge branch 'master' of https://github.com/VOREStation/VOREStation
2018-02-21 22:19:24 -05:00
mob
Merge branch 'master' of https://github.com/VOREStation/VOREStation
2018-02-21 22:19:24 -05:00
multiz
Merge branch 'master' of https://github.com/VOREStation/VOREStation
2018-02-21 22:19:24 -05:00
nano
…
nifsoft
Removes several ways to know every language
2018-02-04 13:03:49 -05:00
organs
Merge branch 'master' of https://github.com/VOREStation/VOREStation
2018-02-21 22:19:24 -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
Phorochemistry
All my changes so far.
2018-02-02 04:57:01 -05:00
planet
Merge branch 'master' of https://github.com/VOREStation/VOREStation
2018-02-02 19:25:51 -05:00
power
Merge branch 'master' of https://github.com/VOREStation/VOREStation
2018-02-21 22:19:24 -05:00
projectiles
Merge branch 'master' of https://github.com/VOREStation/VOREStation
2018-02-21 22:19:24 -05:00
random_map
Merge polaris sync 01 17 2018
2018-01-17 17:56:51 -05:00
reagents
Merge branch 'master' of https://github.com/VOREStation/VOREStation
2018-02-21 22:19:24 -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
Merge branch 'master' of https://github.com/VOREStation/VOREStation
2018-02-21 22:19:24 -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
Merge branch 'master' of https://github.com/VOREStation/VOREStation
2018-02-21 22:19:24 -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 branch 'master' of https://github.com/VOREStation/VOREStation
2018-02-21 22:19:24 -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
…