cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-14 10:53:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
3dd20078aefe68f252bc385a1663f88abe5ca5a9
Bubberstation/code/_globalvars
History
Jack Edge aaefe844c1 Merge branch 'master' into my-best-friend-is-a-holocarp 
Conflicts:
	code/_globalvars/lists/names.dm
	code/modules/mob/living/simple_animal/guardian/types/explosive.dm
	code/modules/mob/living/simple_animal/guardian/types/protector.dm
	code/modules/mob/living/simple_animal/guardian/types/ranged.dm
	code/modules/mob/living/simple_animal/guardian/types/standard.dm
	code/modules/mob/living/simple_animal/guardian/types/support.dm
2016-04-07 22:56:08 +01:00
..
lists
Merge branch 'master' into my-best-friend-is-a-holocarp
2016-04-07 22:56:08 +01:00
configuration.dm
Merge remote-tracking branch 'upstream/master' into hog-mergeconflicts
2015-11-02 01:06:30 -03:00
database.dm
…
game_modes.dm
…
genetics.dm
…
logging.dm
Add global list of AT roundstart cords
2015-07-18 20:17:46 +09:00
misc.dm
…
station.dm
Removes unused ?module? code
2016-01-03 14:55:18 +01:00