cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-02-05 05:59:22 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
36aedc2c82450e9ddb250b8aad150f0ee6424dea
CHOMPStation2/code/modules
History
Kelshark 36aedc2c82 Merge branch 'master' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	code/modules/vore/appearance/sprite_accessories_vr.dm
#	icons/mob/vore/taurs_vr.dmi
2016-10-07 14:24:55 -04:00
..
admin
Late September Sync (#579)
2016-09-24 14:12:43 -04:00
alarm
…
assembly
…
awaymissions
…
blob
…
client
Merge branch 'master' of https://github.com/VOREStation/VOREStation
2016-10-07 14:24:55 -04:00
clothing
Adds in security wolf-taur suit and a custom item (#599)
2016-09-27 01:08:31 -04:00
customitems
…
detectivework
September Polaris Sync (#545)
2016-09-11 19:52:40 -04:00
economy
Late September Sync (#579)
2016-09-24 14:12:43 -04:00
error_handler
September Polaris Sync (#545)
2016-09-11 19:52:40 -04:00
events
Polaris Sync & bugfix
2016-08-17 22:02:05 -04:00
examine
Late September Sync (#579)
2016-09-24 14:12:43 -04:00
ext_scripts
…
flufftext
September Polaris Sync (#545)
2016-09-11 19:52:40 -04:00
food
adds bun-bun, a bread monkey made with two burger buns
2016-07-05 18:19:05 +01:00
games
Late September Sync (#579)
2016-09-24 14:12:43 -04: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
…
integrated_electronics
Late September Sync (#579)
2016-09-24 14:12:43 -04:00
library
…
lighting
…
maps
…
materials
Construction Tweaks and Fixes (#2253)
2016-08-02 18:39:22 +01:00
mining
September Polaris Sync (#545)
2016-09-11 19:52:40 -04:00
mob
Merge branch 'master' of https://github.com/VOREStation/VOREStation
2016-10-07 14:24:55 -04:00
multiz
Late September Sync (#579)
2016-09-24 14:12:43 -04:00
nano
…
organs
Fixes bleeding inside simple mobs (#621)
2016-10-02 14:22:51 -04:00
overmap
…
paperwork
Late September Sync (#579)
2016-09-24 14:12:43 -04:00
power
September Polaris Sync (#545)
2016-09-11 19:52:40 -04:00
projectiles
Late September Sync (#579)
2016-09-24 14:12:43 -04: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-10-07 14:24:55 -04:00
recycling
September Polaris Sync (#545)
2016-09-11 19:52:40 -04:00
research
Late September Sync (#579)
2016-09-24 14:12:43 -04:00
scripting
Late September Sync (#579)
2016-09-24 14:12:43 -04:00
security levels
September Polaris Sync (#545)
2016-09-11 19:52:40 -04:00
shieldgen
…
shuttles
Late September Sync (#579)
2016-09-24 14:12:43 -04:00
spells
Merge branch 'master' of https://github.com/PolarisSS13/Polaris
2016-07-03 16:21:21 -04:00
supermatter
…
surgery
Late September Sync (#579)
2016-09-24 14:12:43 -04:00
tables
makes benches a subtype of tables
2016-06-29 17:52:27 -04:00
vehicles
Late September Sync (#579)
2016-09-24 14:12:43 -04:00
ventcrawl
Late September Sync (#579)
2016-09-24 14:12:43 -04:00
virus2
…
vore
Merge branch 'master' of https://github.com/VOREStation/VOREStation
2016-10-07 14:24:55 -04:00
xenoarcheaology
Allow the excavation drill to actually mine 30cm as advertised
2016-09-25 07:18:15 -07:00
xenobio2
September Polaris Sync (#545)
2016-09-11 19:52:40 -04:00
xgm
…