cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-15 20:52:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
d100c30821929fe40b4989a60848255b95b3a8ee
CHOMPStation2/code/modules
History
Arokha Sieyes d100c30821 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into novearlysync 
# Conflicts:
#	html/changelogs/.all_changelog.yml
#	icons/mob/hud.dmi
#	maps/polaris-1.dmm

Fake conflicts from a merge error previously. No real conflicts.
2016-11-04 15:42:32 -04:00
..
admin
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into novearlysync
2016-11-04 15:42:32 -04:00
alarm
…
assembly
Polaris Sync October 9th (#633)
2016-10-09 18:55:29 -04:00
awaymissions
Symbol fix (#637)
2016-10-09 20:05:49 -04:00
blob
…
client
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into novearlysync
2016-11-04 15:42:32 -04:00
clothing
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into novearlysync
2016-11-04 15:42:32 -04:00
customitems
…
detectivework
Polaris Sync October 9th (#633)
2016-10-09 18:55:29 -04:00
economy
Polaris Sync October 9th (#633)
2016-10-09 18:55:29 -04:00
error_handler
…
events
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into novearlysync
2016-11-04 15:42:32 -04:00
examine
Late September Sync (#579)
2016-09-24 14:12:43 -04:00
ext_scripts
…
flufftext
This fixes a bunch of things so here's each file change and why:
2016-10-20 16:34:34 -04:00
food
…
gamemaster
Polaris Sync October 9th (#633)
2016-10-09 18:55:29 -04:00
games
Polaris Sync October 9th (#633)
2016-10-09 18:55:29 -04:00
genetics
…
ghosttrap
…
holodeck
Polaris Sync October 9th (#633)
2016-10-09 18:55:29 -04:00
hydroponics
Polaris Sync October 9th (#633)
2016-10-09 18:55:29 -04:00
icon generation
…
integrated_electronics
More merge conflict fixing that didn't happen before, plus fix rolling down khi jumpsuits, and change my own spacesuit
2016-10-21 00:18:46 -04:00
library
Polaris Sync October 9th (#633)
2016-10-09 18:55:29 -04:00
lighting
…
maps
…
materials
Polaris Sync October 9th (#633)
2016-10-09 18:55:29 -04:00
metric
Polaris Sync October 9th (#633)
2016-10-09 18:55:29 -04:00
mining
Polaris Sync October 9th (#633)
2016-10-09 18:55:29 -04:00
mob
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into novearlysync
2016-11-04 15:42:32 -04:00
multiz
Late September Sync (#579)
2016-09-24 14:12:43 -04:00
nano
Polaris Sync October 9th (#633)
2016-10-09 18:55:29 -04:00
organs
FBP/Synth wound sprite updater
2016-11-04 14:24:15 -04:00
overmap
…
paperwork
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into novearlysync
2016-11-04 15:42:32 -04:00
power
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into novearlysync
2016-11-04 15:42:32 -04:00
projectiles
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync
2016-10-20 21:24:07 -04:00
random_map
Polaris Sync October 9th (#633)
2016-10-09 18:55:29 -04:00
reagents
Polaris Sync October 9th (#633)
2016-10-09 18:55:29 -04:00
recycling
Polaris Sync October 9th (#633)
2016-10-09 18:55:29 -04:00
research
Omnihud glasses
2016-10-22 18:14:27 -04:00
scripting
Late September Sync (#579)
2016-09-24 14:12:43 -04:00
security levels
…
shieldgen
…
shuttles
Late September Sync (#579)
2016-09-24 14:12:43 -04:00
spells
Polaris Sync October 9th (#633)
2016-10-09 18:55:29 -04:00
supermatter
…
surgery
Late September Sync (#579)
2016-09-24 14:12:43 -04:00
tables
…
vehicles
Fixes w_class of items to be consistent with Polaris update (#636)
2016-10-09 19:23:10 -04:00
ventcrawl
Late September Sync (#579)
2016-09-24 14:12:43 -04:00
virus2
Polaris Sync October 9th (#633)
2016-10-09 18:55:29 -04:00
vore
Merge pull request #680 from VOREStation/microtweak
2016-10-23 18:25:03 -04:00
xenoarcheaology
Fixes w_class of items to be consistent with Polaris update (#636)
2016-10-09 19:23:10 -04:00
xenobio2
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync
2016-10-20 21:24:07 -04:00
xgm
…