cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-03-26 22:18:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
33202c5c385d8cb769a17e38e153bb200caea148
CHOMPStation2/code/modules
History
Leshana 33202c5c38 Merge commit '7075a65df022bc0eae0c3fe6ff501b1bce449cdd' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-05-01 
# Conflicts:
#	code/modules/mob/living/simple_animal/animals/giant_spider.dm
#	html/changelogs/.all_changelog.yml
2018-05-10 13:48:20 -04:00
..
admin
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync-04252018
2018-04-25 17:23:33 -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
Arranges lots of things into planes (#5072)
2018-03-28 12:59:12 -07:00
busy_space
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into vplk-sync-2018-04-14
2018-04-15 14:19:36 -04:00
busy_space_vr
ONI ship names, updated work roles
2018-04-14 23:38:27 -04:00
client
Merge commit '7075a65df022bc0eae0c3fe6ff501b1bce449cdd' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-05-01
2018-05-10 13:48:20 -04:00
clothing
Removes taur suits
2018-05-04 22:16:17 -04:00
customitems
…
detectivework
…
economy
Species economic modifier is now a species var
2018-04-19 18:06:02 -05:00
entopics_vr
…
error_handler
POLARIS: Moves daily logs into being folders rather than files
2018-03-13 18:20:59 -04:00
events
Merge commit '7075a65df022bc0eae0c3fe6ff501b1bce449cdd' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-05-01
2018-05-10 13:48:20 -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
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-03-30
2018-03-31 09:20:59 -04:00
food
Update recipes_microwave_vr.dm
2018-04-14 14:17:13 +02:00
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
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync-04252018
2018-04-25 17:23:33 -04:00
icon generation
…
integrated_electronics
Fixes IC button label reference in chat messages
2018-05-06 01:39:56 -04:00
library
…
lighting
Revert "Merge pull request #4779 from Neerti/2/1/2018_make_the_sun_not_lag_again"
2018-04-18 18:08:16 -04:00
lore_codex
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync-04252018
2018-04-25 17:23:33 -04:00
maps
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-04-04
2018-04-06 15:40:06 -04:00
materials
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync-04252018
2018-04-25 17:23:33 -04:00
media
…
metric
…
mining
Fix underdark mob spawn areas again again again
2018-05-04 22:18:03 -04:00
mob
Merge commit '7075a65df022bc0eae0c3fe6ff501b1bce449cdd' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-05-01
2018-05-10 13:48:20 -04:00
multiz
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into vplk-sync-2018-04-14
2018-04-15 14:19:36 -04:00
nano
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-03-30
2018-03-31 09:20:59 -04:00
nifsoft
Fix talking in AR when caught in own soulcatcher
2018-05-06 01:25:56 -04:00
organs
Xenochimera can't take synth limbs
2018-04-30 15:45:50 -04:00
overmap
…
paperwork
Lore updates (#3430)
2018-04-14 12:58:42 -04:00
persistence
Convert bellies to save using JSON
2018-03-02 02:22:20 -05:00
planet
Merge commit '7075a65df022bc0eae0c3fe6ff501b1bce449cdd' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-05-01
2018-05-10 13:48:20 -04:00
power
Merge commit '7075a65df022bc0eae0c3fe6ff501b1bce449cdd' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-05-01
2018-05-10 13:48:20 -04:00
projectiles
Merge commit '7075a65df022bc0eae0c3fe6ff501b1bce449cdd' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-05-01
2018-05-10 13:48:20 -04:00
random_map
…
reagents
Removed shadekin from Slime Vore reaction
2018-05-08 14:29:48 +10:00
recycling
POLARIS: Fix conveyors on dynamically loaded maps obeying switches.
2018-04-19 20:51:05 -04:00
research
Adds Quantum Pads
2018-04-19 18:13:30 -04:00
resleeving
VS: Support genetic modifiers in resleeving, fix colorblindness
2018-05-03 17:52:27 -04:00
rogueminer_vr
…
scripting
…
security levels
…
shieldgen
Power cost decrease on Lights and Shield Diffusers
2018-04-29 20:11:20 -07:00
shuttles
POLARIS: Silly piloting helmet animation
2018-03-20 22:52:49 -04:00
spells
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into vplk-sync-2018-04-14
2018-04-15 14:19:36 -04:00
surgery
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync-04252018
2018-04-25 17:23:33 -04:00
tables
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into vplk-sync-2018-04-14
2018-04-15 14:19:36 -04:00
telesci
Fixes qpad deconstruct
2018-04-20 02:02:06 -04:00
tension
…
tooltip
POLARIS: Tooltip framework, and mob tooltips
2018-03-20 22:42:16 -04:00
turbolift
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-03-30
2018-03-31 09:20:59 -04:00
vehicles
Lazily implements taur riding
2018-04-12 15:10:17 -04:00
ventcrawl
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-03-30
2018-03-31 09:20:59 -04:00
virus2
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-03-30
2018-03-31 09:20:59 -04:00
vore
Merge pull request #3634 from VOREStation/aro-taur_suits_must_die
2018-05-08 19:09:29 -04:00
xenoarcheaology
Merge commit '7075a65df022bc0eae0c3fe6ff501b1bce449cdd' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-05-01
2018-05-10 13:48:20 -04:00
xenobio
Species names should now use defines
2018-03-15 20:24:45 -05:00
xenobio2
…
xgm
…