cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-02-05 14:10:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
c0086f66ecbeed4718646a2ea2b3ddffa226e17d
CHOMPStation2/code/modules
History
Kelshark c0086f66ec Merge branch 'master' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	maps/RandomZLevels/backup/labyrinth.dmm
#	vorestation.dme
2016-09-10 00:54:59 -04:00
..
admin
Polaris Sync & bugfix
2016-08-17 22:02:05 -04:00
alarm
…
assembly
…
awaymissions
…
blob
…
client
Merge branch 'master' of https://github.com/VOREStation/VOREStation
2016-09-10 00:54:59 -04:00
clothing
Adds in taur specific void/rigsuits (#524)
2016-08-28 05:44:33 -04:00
customitems
…
detectivework
Fixes #2092
2016-08-15 11:33:41 -04:00
economy
Cleans up the code to match recent Tajaran rewrite
2016-08-13 23:07:00 -05:00
events
Polaris Sync & bugfix
2016-08-17 22:02:05 -04:00
examine
AI Core Update
2016-07-05 17:33:34 -04:00
ext_scripts
…
flufftext
…
food
adds bun-bun, a bread monkey made with two burger buns
2016-07-05 18:19:05 +01:00
games
Cleans up the code to match recent Tajaran rewrite
2016-08-13 23:07:00 -05:00
genetics
…
ghosttrap
…
holodeck
item_state cleanup
2016-07-11 22:31:32 -04:00
hydroponics
Polaris Sync & bugfix
2016-08-17 22:02:05 -04:00
icon generation
…
library
…
lighting
…
maps
…
materials
Construction Tweaks and Fixes (#2253)
2016-08-02 18:39:22 +01:00
mining
Polaris Sync & bugfix
2016-08-17 22:02:05 -04:00
mob
Merge branch 'master' of https://github.com/VOREStation/VOREStation
2016-09-10 00:54:59 -04:00
multiz
…
nano
…
organs
Polaris Sync & bugfix
2016-08-17 22:02:05 -04:00
overmap
…
paperwork
Polaris Sync & bugfix
2016-08-17 22:02:05 -04:00
power
Ghosts seeing power in a wire upon examination
2016-07-25 14:23:53 +01:00
projectiles
Merge pull request #2222 from SpadesNeil/ammo-mag-pixel-offset
2016-07-30 23:21:47 +01:00
random_map
Grammar fix + Ensures Christmas drop pod has trees
2016-07-23 15:23:54 +01:00
reagents
Merge branch 'master' of https://github.com/VOREStation/VOREStation
2016-08-21 16:05:27 -04:00
recycling
Revert "Frame Cleanup"
2016-08-06 00:27:03 +01:00
research
Polaris Sync & bugfix
2016-08-17 22:02:05 -04:00
scripting
…
security levels
Revert "Frame Cleanup"
2016-08-06 00:27:03 +01:00
shieldgen
…
shuttles
…
spells
Merge branch 'master' of https://github.com/PolarisSS13/Polaris
2016-07-03 16:21:21 -04:00
supermatter
…
surgery
Halves cable amount required for deep intensive FBP/robotic stuff repair
2016-07-28 15:48:13 +01:00
tables
makes benches a subtype of tables
2016-06-29 17:52:27 -04:00
vehicles
…
virus2
…
vore
Merge branch 'master' of https://github.com/VOREStation/VOREStation
2016-08-30 12:19:41 -04:00
xenoarcheaology
Polaris Sync & bugfix
2016-08-17 22:02:05 -04:00
xenobio2
Polaris sync
2016-08-06 20:34:44 -07:00
xgm
…