cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-31 09:09:49 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
7c6aadd829b741eb46fb71bf546322e2be15d360
CHOMPStation2/code/modules
T
History
Repede 7c6aadd829 Merge branch 'master' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	code/datums/supplypacks/munitions.dm
#	code/datums/supplypacks/security.dm
#	code/game/area/Space Station 13 areas.dm
#	code/modules/mob/living/carbon/human/update_icons.dm
#	code/modules/mob/living/silicon/robot/robot_modules/station.dm
#	code/modules/vore/fluffstuff/custom_guns_vr.dm
2018-03-23 20:25:18 -04:00
..
admin
Merge branch 'master' of https://github.com/VOREStation/VOREStation
2018-03-23 20:25:18 -04:00
alarm
…
assembly
…
awaymissions
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-03-15
2018-03-15 22:41:14 -04:00
blob
…
blob2
Slimes should no longer /list you.
2018-02-20 01:58:49 -06:00
busy_space
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-03-15
2018-03-15 22:41:14 -04:00
client
Merge branch 'master' of https://github.com/VOREStation/VOREStation
2018-03-23 20:25:18 -04:00
clothing
Merge branch 'master' of https://github.com/VOREStation/VOREStation
2018-03-23 20:25:18 -04:00
customitems
…
detectivework
…
DMAPI
Noobie mistake fix
2018-03-08 17:46:07 -05:00
economy
More standardized grammar (#4977)
2018-03-02 18:24:15 -08:00
entopics_vr
…
error_handler
POLARIS: Moves daily logs into being folders rather than files
2018-03-10 17:18:55 -05:00
events
VS: Helps with #2982 #2521 #2541 - Solar grub event tweaks
2018-03-20 18:15:04 -04:00
examine
…
ext_scripts
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-03-15
2018-03-15 22:41:14 -04:00
flufftext
…
food
…
gamemaster
…
games
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-03-15
2018-03-15 22:41:14 -04:00
genetics
…
ghosttrap
…
holodeck
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-03-15
2018-03-15 22:41:14 -04:00
holomap
Reorganzied Holo Minimaps into SSholomaps subsystem.
2018-03-04 21:54:20 -05:00
hydroponics
Adds onions to the seed vender
2018-02-26 18:57:32 +00:00
icon generation
…
integrated_electronics
…
interserver shipping
…
library
…
lighting
…
lore_codex
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-03-15
2018-03-15 22:41:14 -04:00
maps
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-03-15
2018-03-15 22:41:14 -04:00
materials
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync
2018-03-03 13:09:57 -05:00
media
…
metric
…
mining
Merge branch 'master' of https://github.com/VOREStation/VOREStation
2018-03-23 20:25:18 -04:00
mob
Merge branch 'master' of https://github.com/VOREStation/VOREStation
2018-03-23 20:25:18 -04:00
multiz
Merge branch 'master' of https://github.com/VOREStation/VOREStation
2018-03-23 20:25:18 -04:00
nano
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-23
2018-02-23 21:55:42 -05:00
nifsoft
VS: NIF small refactor
2018-03-15 23:47:15 -04:00
organs
Merge branch 'master' of https://github.com/VOREStation/VOREStation
2018-03-23 20:25:18 -04:00
overmap
…
paperwork
Merge branch 'master' of https://github.com/VOREStation/VOREStation
2018-03-23 20:25:18 -04:00
persistence
Convert bellies to save using JSON
2018-03-02 02:22:20 -05:00
Phorochemistry
…
planet
Merge branch 'master' of https://github.com/VOREStation/VOREStation
2018-03-06 18:11:39 -05:00
power
Merge branch 'master' of https://github.com/VOREStation/VOREStation
2018-03-23 20:25:18 -04:00
projectiles
Merge branch 'master' of https://github.com/VOREStation/VOREStation
2018-03-23 20:25:18 -04:00
random_map
…
reagents
Merge branch 'master' of https://github.com/VOREStation/VOREStation
2018-03-23 20:25:18 -04:00
recycling
POLARIS: Revamp logging to be consistent
2018-03-10 17:18:09 -05:00
research
Remove design_vr for ear translator as it's a stock polaris one now
2018-03-04 13:59:08 -05:00
resleeving
POLARIS: Revamp logging to be consistent
2018-03-10 17:18:09 -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
…
spells
…
surgery
POLARIS: Fixes #3264 (VS) - MMI insertion sanitizes w/o numbers allowed
2018-03-20 14:58:00 -04:00
tables
…
telesci
…
tension
…
tooltip
POLARIS: Tooltip framework, and mob tooltips
2018-03-12 18:25:53 -04:00
turbolift
…
vehicles
Merge branch 'master' of https://github.com/VOREStation/VOREStation
2018-03-23 20:25:18 -04:00
ventcrawl
POLARIS: Ventcrawling assistance
2018-03-19 23:01:00 -04:00
virus2
Merge pull request #3255 from VOREStation/aro-robocheck
2018-03-16 20:34:10 -04:00
vore
Merge branch 'master' of https://github.com/VOREStation/VOREStation
2018-03-23 20:25:18 -04:00
xenoarcheaology
POLARIS: Revamp logging to be consistent
2018-03-10 17:18:09 -05:00
xenobio
Species names should now use defines
2018-03-15 20:24:45 -05:00
xenobio2
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-23
2018-02-23 21:55:42 -05:00
xgm
…