cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-17 13:42:44 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
a7fa8cde4994fc37c37d74484cd3aa88f1daefaa
Polaris/code/modules
History
PsiOmegaDelta a7fa8cde49 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/modules/clothing/spacesuits/void/merc.dm
	code/modules/mob/living/living.dm
	code/modules/mob/living/simple_animal/borer/borer_captive.dm
	code/modules/mob/mob_grab_specials.dm
	code/modules/reagents/reagent_containers/food/drinks/bottle.dm
	html/changelogs/.all_changelog.yml
2015-09-11 08:54:03 +02:00
..
admin
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-09-08 08:22:37 +02:00
alarm
…
assembly
Non-headset/borg radios now all allow access to department channels. Headset and borg radios still rely on their encryption keys.
2015-09-03 09:38:15 +02:00
awaymissions
…
client
Merge pull request #10266 from PsiOmegaDelta/150722-TagPairs
2015-09-07 13:57:09 +09:30
clothing
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-09-11 08:54:03 +02:00
customitems
…
detectivework
…
economy
…
events
…
examine
…
ext_scripts
…
flufftext
…
food
…
games
…
genetics
…
ghosttrap
…
holodeck
…
hydroponics
Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into dev
2015-09-07 11:31:19 +09:30
icon generation
…
library
…
lighting
…
liquid
…
maps
…
materials
…
mining
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-09-11 08:54:03 +02:00
mob
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-09-11 08:54:03 +02:00
multiz
…
nano
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-09-08 08:22:37 +02:00
organs
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-09-11 08:54:03 +02:00
overmap
…
paperwork
Merge pull request #10266 from PsiOmegaDelta/150722-TagPairs
2015-09-07 13:57:09 +09:30
power
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-09-11 08:54:03 +02:00
projectiles
Merge pull request #10672 from mwerezak/frag-grenade
2015-09-07 14:12:27 +09:30
random_map
…
reagents
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-09-11 08:54:03 +02:00
recycling
…
research
Merge pull request #10672 from mwerezak/frag-grenade
2015-09-07 14:12:27 +09:30
scripting
…
security levels
…
shieldgen
…
shuttles
…
spells
…
supermatter
…
surgery
…
tables
…
vehicles
Merge pull request #10672 from mwerezak/frag-grenade
2015-09-07 14:12:27 +09:30
virus2
Merge pull request #10266 from PsiOmegaDelta/150722-TagPairs
2015-09-07 13:57:09 +09:30
xgm
…