cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-26 18:13:35 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
f9b6171106f177fedc1bb653d9da504655e56177
CHOMPStation2/code/modules
History
Kelshark 69f700304c Merge branch 'master' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	config/custom_items.txt
#	maps/virgo-1.dmm
#	maps/virgo-5.dmm
2017-01-28 00:15:12 -05:00
..
admin
Fixed mute issues and map stairs issues
2017-01-28 00:14:04 -05:00
alarm
…
assembly
…
awaymissions
Disable away missions during unit testing because it never finishes aaaaaaaaaaaaa
2017-01-24 21:26:50 -05:00
blob
…
client
Fixed mute issues and map stairs issues
2017-01-28 00:14:04 -05:00
clothing
Merge branch 'master' of https://github.com/Repede/YawnWiderStation
2016-12-30 15:36:43 -05:00
customitems
…
detectivework
…
economy
…
error_handler
…
events
Polaris December Sync
2016-12-10 09:51:11 -05:00
examine
…
ext_scripts
…
flufftext
…
food
…
gamemaster
…
games
…
genetics
…
ghosttrap
…
holodeck
…
hydroponics
Makes mushroom sprites show up correctly when harvested (#788)
2016-12-30 23:06:57 -05:00
icon generation
…
integrated_electronics
Also fixes EPv2 circuit not pushing data.
2017-01-14 14:04:19 -05:00
library
…
lighting
…
maps
…
materials
Flesh Turfs
2017-01-24 23:48:50 -03:00
metric
…
mining
…
mob
Merge branch 'master' of https://github.com/VOREStation/VOREStation
2017-01-28 00:15:12 -05:00
multiz
Merge branch 'master' of https://github.com/VOREStation/VOREStation
2016-12-18 00:56:03 -05:00
nano
…
organs
Merge branch 'master' of https://github.com/VOREStation/VOREStation
2017-01-21 01:42:11 -05:00
overmap
…
paperwork
Polaris December Sync
2016-12-10 09:51:11 -05:00
power
Fixes lights for macros, hopefully.
2016-12-29 02:05:17 -05:00
projectiles
Merge branch 'master' of https://github.com/VOREStation/VOREStation
2017-01-21 01:42:11 -05:00
random_map
Replaces [stack]/fifty atoms with atoms that spawn the normal stack
2016-12-17 17:27:04 -06:00
reagents
Merge branch 'master' of https://github.com/VOREStation/VOREStation
2017-01-28 00:15:12 -05:00
recycling
…
research
Merge pull request #837 from Cameron653/master
2017-01-19 00:39:08 -05:00
scripting
…
security levels
…
shieldgen
…
shuttles
…
spells
…
supermatter
…
surgery
…
tables
…
vehicles
…
ventcrawl
…
virus2
…
vore
Merge branch 'master' of https://github.com/VOREStation/VOREStation
2017-01-28 00:15:12 -05:00
xenoarcheaology
Voremob tweaks, bellies now escapable (#783)
2016-12-30 11:27:07 -05:00
xenobio2
Increase transfer rate of Xenobio injector
2017-01-25 16:03:02 -05:00
xgm
…