2d06c71404
added space kiwis as a new simple mob ( #5334 )
...
* added space kiwis as a new simple mob
* Fixed syntax typo
I hate everything
2018-02-06 19:07:31 -06:00
1c02892893
Automatic changelog generation for PR #5327 [ci skip]
2018-02-06 19:06:34 -06:00
7126b61205
[MIRROR] Return of ore stacking, various changes to lavaland bombs to facilitate reduced lag ( #5327 )
...
* Return of ore stacking, various changes to lavaland bombs to facilitate reduced lag
* really? Like, a dozen fucking map conflicts. this map was fucked entirely
2018-02-06 19:06:31 -06:00
b6c4bd6e01
[MIRROR] Fixes bloodpack sprite issues ( #5333 )
...
* Fixes bloodpack sprite issues
* Update packs.dm
* fuck this godamn map
2018-02-06 18:24:51 -06:00
730580efeb
Adds mentor tables
2018-02-06 16:07:09 -06:00
380556dde4
Merge pull request #5330 from Citadel-Station-13/upstream-merge-35156
...
[MIRROR] Slaughter demon, Morph, ERT / Deathsquad antag datums.
2018-02-06 17:54:05 +00:00
be33afbc97
Merge pull request #5335 from Citadel-Station-13/ventnerf
...
[MIRROR] Nerfs Vent Clog
2018-02-06 16:58:57 +00:00
64eb7ee274
Automatic changelog generation for PR #5337 [ci skip]
2018-02-06 10:58:20 -06:00
68712ca637
Merge pull request #5337 from Michiyamenotehifunana/cat-ears-for-cat-knights
...
Makes Catknights Cats Again
2018-02-06 16:58:17 +00:00
2860b331d6
Automatic changelog generation for PR #5324 [ci skip]
2018-02-06 10:52:13 -06:00
df48bdfcd9
Merge pull request #5324 from improvedname/cargonia-is-glorious!
...
Adds disco ball to cargonia
2018-02-06 16:52:10 +00:00
1d4e0d3511
Oops, copy paste fail
2018-02-06 09:56:36 -06:00
1bf0cdac64
Update slaughterevent.dm
2018-02-06 09:56:10 -06:00
35dcf5dce1
Update slaughter.dm
2018-02-06 09:50:12 -06:00
79cb10f8ec
Update morph.dm
2018-02-06 09:49:46 -06:00
5a5b74c8d7
Fixes catknight ears
2018-02-06 22:31:23 +08:00
469abfd599
Update vent_clog.dm
2018-02-06 02:16:25 -06:00
4be9acea1d
Snowdin pixel_x bugs
2018-02-05 21:39:21 -06:00
1cea674509
Update antag_spawner.dm
2018-02-05 21:35:15 -06:00
0ecb7ad81b
Merge branch 'master' into cargonia-is-glorious!
2018-02-06 02:54:58 +00:00
d17ccace75
Automatic changelog generation for PR #5317 [ci skip]
2018-02-05 20:53:59 -06:00
d5f703bc58
Merge pull request #5317 from improvedname/Loadout
...
Organizes job spefific loadout stuff by departments
2018-02-06 02:53:57 +00:00
f8344cd6f5
Automatic changelog generation for PR #5316 [ci skip]
2018-02-05 20:53:26 -06:00
a3649fc6fe
Merge pull request #5316 from improvedname/Cargo
...
Turns the kinkmate resupply crate into an construction kit
2018-02-06 02:53:24 +00:00
b4aca60ce1
Automatic changelog generation for PR #5307 [ci skip]
2018-02-05 20:51:56 -06:00
9780fc64e3
Merge pull request #5307 from Michiyamenotehifunana/Medical-Turtleneck
...
Adds the CMO's Turtleneck!
2018-02-06 02:51:54 +00:00
b5c92f7c1e
Automatic changelog generation for PR #5332 [ci skip]
2018-02-05 20:48:54 -06:00
0696c9eac5
Merge pull request #5332 from Citadel-Station-13/upstream-merge-35324
...
[MIRROR] Fix defibrillator mount runtiming continously while empty
2018-02-06 02:48:52 +00:00
cc78931f53
Merge pull request #5331 from Citadel-Station-13/upstream-merge-35368
...
[MIRROR] Starts the reconquer of the changelog from the profane infidels
2018-02-06 02:48:37 +00:00
156fa1da1a
Update antag_spawner.dm
2018-02-05 21:47:53 -05:00
5357d4bd69
Merge pull request #5328 from Citadel-Station-13/upstream-merge-35322
...
[MIRROR] Adds missing wrapper for abductor roundend report.
2018-02-06 02:46:05 +00:00
6d466b25dd
Automatic changelog generation for PR #5326 [ci skip]
2018-02-05 20:44:47 -06:00
f593263a9d
Merge pull request #5326 from Citadel-Station-13/upstream-merge-35295
...
[MIRROR] Fix holorays staying if you switch holopads
2018-02-06 02:44:45 +00:00
3a79a17399
Merge pull request #5325 from Citadel-Station-13/upstream-merge-35316
...
[MIRROR] Fixes comm message list for non-unique messages.
2018-02-06 02:44:29 +00:00
f072443a4c
Automatic changelog generation for PR #5322 [ci skip]
2018-02-05 20:44:15 -06:00
d29477f4a8
Merge pull request #5322 from Citadel-Station-13/upstream-merge-35305
...
[MIRROR] Fixes crematorium on meta/box.
2018-02-06 02:44:12 +00:00
de1aad2b7c
Automatic changelog generation for PR #5321 [ci skip]
2018-02-05 20:43:59 -06:00
c9f7e7f14a
Merge pull request #5321 from Citadel-Station-13/upstream-merge-35152
...
[MIRROR] Rearranges mining vendor items and code, adds conscription kit
2018-02-06 02:43:57 +00:00
89c73c3e5f
Automatic changelog generation for PR #5320 [ci skip]
2018-02-05 20:43:37 -06:00
024347aff2
Merge pull request #5320 from Citadel-Station-13/upstream-merge-35282
...
[MIRROR] Eggs from the abductor egg gland now have a random reagent instead of acid
2018-02-06 02:43:35 +00:00
6eba5071bc
Automatic changelog generation for PR #5319 [ci skip]
2018-02-05 20:43:22 -06:00
85b06c800a
Merge pull request #5319 from Citadel-Station-13/upstream-merge-35299
...
[MIRROR] fixes small grammar issue on arcades
2018-02-06 02:43:20 +00:00
8f26d222c5
Automatic changelog generation for PR #5318 [ci skip]
2018-02-05 20:43:07 -06:00
52109ef2ec
Merge pull request #5318 from Citadel-Station-13/upstream-merge-35000
...
[MIRROR] Snowdin 2.0
2018-02-06 02:43:05 +00:00
6c037ef051
Fix defibrillator mount runtiming continously while empty
2018-02-05 17:59:24 -06:00
a7057f8331
Merge pull request #35324 from AutomaticFrenzy/patch/defibrillator-runtime
...
Fix defibrillator mount runtiming continously while empty
2018-02-05 17:59:24 -06:00
291e987f0d
Starts the reconquer of the changelog from the profane infidels
2018-02-05 17:58:12 -06:00
2bb6d7c39d
Merge pull request #35368 from nicbn/patch-1
...
Starts the reconquer of the changelog from the profane infidels
2018-02-05 17:58:12 -06:00
acec5bc6ad
Merge branch 'master' into Medical-Turtleneck
2018-02-06 07:47:29 +08:00
f9666ab6c9
Slaughter demon, Morph, ERT / Deathsquad antag datums.
2018-02-05 17:00:09 -06:00
theTiji0