 tkdrg
|
77928440e2
|
Merge pull request #13571 from KorPhaeron/gate_destruction
Gateway/singularity interaction fix
|
2015-12-18 00:23:23 -03:00 |
|
 KorPhaeron
|
2e57936f94
|
Fixes gateway interaction
|
2015-12-17 21:12:30 -06:00 |
|
|
tkdrg
|
f93aac3cab
|
Merge pull request #13687 from Buggy123/master
Reduces cooldown of the Bluespace Artillery on the space battle away mission
|
2015-12-17 20:25:25 -03:00 |
|
 Buggy123
|
292e5ea424
|
Update bluespaceartillery.dm
|
2015-12-17 17:16:59 -05:00 |
|
|
KorPhaeron
|
5ee7c1a0b4
|
Fixes gateway checks
|
2015-12-17 01:45:09 -06:00 |
|
 oranges
|
134a76cc8f
|
Line ending apocalypse
|
2015-12-17 14:12:37 +13:00 |
|
 MMMiracles
|
cde4df61ae
|
conFLICTS
|
2015-12-16 06:26:54 -05:00 |
|
 Jordie
|
adf0f7b416
|
Merge pull request #13596 from MMMiracles/thenaskeletonpoppedout
Makes the zombie and skeleton corpsespawners actually make zombies and skeletons
|
2015-12-16 21:27:07 +11:00 |
|
|
Buggy123
|
41fb4c9576
|
Update bluespaceartillery.dm
|
2015-12-15 23:31:07 -05:00 |
|
|
Buggy123
|
9515e5dd98
|
Update bluespaceartillery.dm
|
2015-12-15 23:05:59 -05:00 |
|
|
Buggy123
|
f9e6eacb31
|
Update bluespaceartillery.dm
|
2015-12-15 23:05:49 -05:00 |
|
|
Buggy123
|
557b52bb76
|
Update bluespaceartillery.dm
|
2015-12-15 23:03:39 -05:00 |
|
|
MMMiracles
|
55ebaf3bdb
|
snow stuff i guess
|
2015-12-15 17:33:34 -05:00 |
|
|
MMMiracles
|
392ca2a505
|
Merge branch 'master' of https://github.com/tgstation/-tg-station into snowiscold
|
2015-12-15 16:54:22 -05:00 |
|
|
MMMiracles
|
d07f300063
|
i did things
|
2015-12-15 16:46:24 -05:00 |
|
 xxalpha
|
051e5b889b
|
Added code to resmooth loaded maps atoms.
|
2015-12-14 01:41:18 +00:00 |
|
|
MMMiracles
|
401a947a08
|
fixes plasmaman corpse spawner, adds a comment about it using the typepath.
|
2015-12-12 23:54:00 -05:00 |
|
|
MMMiracles
|
bf902bbe7c
|
question answered, then.
|
2015-12-12 19:15:49 -05:00 |
|
|
MMMiracles
|
a2d0086762
|
consistency is a virtue
|
2015-12-12 19:09:47 -05:00 |
|
|
MMMiracles
|
b3d992a832
|
conflict fix
|
2015-12-11 16:21:18 -05:00 |
|
 KorPhaeron
|
24e4792d75
|
Gate Fix
|
2015-12-11 04:26:23 -06:00 |
|
|
MMMiracles
|
d61d655076
|
oh my
|
2015-12-10 23:14:42 -05:00 |
|
 Cheridan
|
b0da7b3a64
|
Merge pull request #13496 from AnturK/spawnerfix
Fixes pre-round sleeper activation
|
2015-12-09 20:16:56 -06:00 |
|
|
Cheridan
|
f29336a4f8
|
Merge pull request #13470 from AnturK/academytwo
Academy Fixes & Upgrades.
|
2015-12-08 22:25:05 -06:00 |
|
|
MMMiracles
|
f222dfe36e
|
mostly final changes, wowzers
|
2015-12-08 21:20:31 -05:00 |
|
|
MMMiracles
|
c384aae4c3
|
more map edits, loot table balancing, bug fixes, also ATV VROOM VROOM
|
2015-12-08 00:43:53 -05:00 |
|
 AnturK
|
4db8386ebb
|
Fixes pre-round sleeper activation
|
2015-12-07 19:36:28 +01:00 |
|
|
MMMiracles
|
81f6c450e5
|
fianl stuff for now, testing!!!!!
|
2015-12-06 14:32:10 -05:00 |
|
|
AnturK
|
1b09b3503d
|
Adds internals box to Academy Defender outfit
|
2015-12-06 14:16:09 +01:00 |
|
|
MMMiracles
|
f8ab62e92e
|
finalization of the topside part, time to make dungeon designs woo
|
2015-12-06 01:13:17 -05:00 |
|
 Nerd Lord
|
58a3f742c6
|
Spawnable hostile constructs, for away missions and adminfuckery.
|
2015-12-05 10:48:52 -05:00 |
|
|
MMMiracles
|
8ab579cb21
|
Merge branch 'master' of https://github.com/tgstation/-tg-station into snowiscold
Conflicts:
icons/mob/animal.dmi
|
2015-12-04 18:55:10 -05:00 |
|
|
MMMiracles
|
77b36e2415
|
iced windows, more ice variants of shit in general.
more stuff, ice everything.
wew
conflict fix
|
2015-12-01 16:45:09 -05:00 |
|
|
Cheridan
|
4f38906dd5
|
Merge pull request #13311 from KorPhaeron/wild_west
Fixes wild west windows
|
2015-11-30 07:12:05 -06:00 |
|
|
KorPhaeron
|
0f2eee4e17
|
Cleans up meatgrinder code
|
2015-11-29 18:30:34 -06:00 |
|
 as334
|
dc98e67f05
|
Just fuck my shit up fam
|
2015-11-29 13:48:58 -05:00 |
|
|
MMMiracles
|
f67dde21d5
|
foundation set, demands given.
|
2015-11-29 12:34:49 -05:00 |
|
|
as334
|
611fb49c1c
|
Wake me up inside
|
2015-11-29 00:58:30 -05:00 |
|
|
AnturK
|
9a434b669c
|
Academy Fixes
|
2015-11-28 23:17:57 +01:00 |
|
|
AnturK
|
b662b470a9
|
Enables ghost to go through ladders
Adds Cold snow turf
Adds Infinite Candles
|
2015-11-28 18:14:52 +01:00 |
|
|
AnturK
|
b14e9133d2
|
Academy Update
|
2015-11-28 12:35:41 +01:00 |
|
|
as334
|
ce9ea0ca46
|
FUCK THIS FUCK EVERYTHING
|
2015-11-26 22:22:07 -05:00 |
|
|
MMMiracles
|
671fa02edf
|
almost there folks
|
2015-11-23 21:53:27 -05:00 |
|
 duncathan salt
|
4a363b4363
|
Merge pull request #12910 from KorPhaeron/ghost_spawner
Ghost spawner naming fix
|
2015-11-23 20:02:53 -06:00 |
|
|
MMMiracles
|
db84542278
|
Merge branch 'master' of https://github.com/tgstation/-tg-station into spookycaves
|
2015-11-21 14:33:45 -05:00 |
|
|
KorPhaeron
|
888fe9fb30
|
Default
|
2015-11-21 06:43:01 -06:00 |
|
|
as334
|
c98a7a0d7e
|
Fixes merge conflicts, also a minor slipup with flags
|
2015-11-17 20:59:43 -05:00 |
|
|
as334
|
ef6af4ef5b
|
Unfucking shit ass plasma memes part 1
|
2015-11-13 21:28:00 -05:00 |
|
|
MMMiracles
|
90c55718af
|
conflict fix oh vey
|
2015-11-13 16:27:03 -05:00 |
|
|
MMMiracles
|
d0356f2741
|
more map changes, misc edits
|
2015-11-13 16:16:57 -05:00 |
|