Commit Graph

10234 Commits

Author SHA1 Message Date
Thalpy
e71dc54594 i-- 2019-10-29 03:29:56 +00:00
Thalpy
a1e611e7aa Heck 2019-10-29 03:23:46 +00:00
Thalpy
39f7116353 Oops 2019-10-29 03:22:21 +00:00
Thalpy
0fabd72087 Barth you fusspot 2019-10-27 22:40:45 +00:00
Thalpy
6de94a23c0 Oops 2019-10-27 22:32:47 +00:00
Thalpy
c30f550274 Well here it is 2019-10-27 22:29:35 +00:00
Thalpy
a76ff4efe6 Alright 2019-10-27 19:24:23 +00:00
Thalpy
739de1b378 Fixes 2019-10-27 19:07:06 +00:00
kevinz000
dabfba8a0d Merge pull request #9619 from BlackMajor/Yote
Buffs engiborg build potential
2019-10-27 05:38:50 -07:00
BlackMajor
a7ecaaf977 Ok but what if light replacer 2019-10-27 15:58:51 +13:00
BlackMajor
f3cbd43d8b What if engiborgs could actually build machines 2019-10-26 22:58:28 +13:00
deathride58
8f479492db Merge pull request #9513 from Citadel-Station-13/kevinz000-patch-98
medibots are now TOXINLOVER (so slimes) friendly
2019-10-25 23:17:30 -04:00
nik707
b324b8bd51 Merge pull request #9408 from Citadel-Station-13/kevinz000-patch-89
adminhelp tickets now show the names of admins who use resolve actions on them
2019-10-25 22:16:27 -05:00
deathride58
53fe02e2fc Merge pull request #9539 from Citadel-Station-13/kevinz000-patch-100
TALLY HO! (adds claymores to the uplink)
2019-10-25 23:16:09 -04:00
nik707
187ea6476b Merge pull request #9572 from Citadel-Station-13/canReachInto_1
Fixes a bunch of CanReach/storage related bugs ("You can no longer stick your hands inside other people and take their things")
2019-10-25 22:16:02 -05:00
kevinz000
daf4acbceb Merge pull request #9599 from Ghommie/Ghommie-cit264
Ports "New Revenant icons"
2019-10-25 20:13:05 -07:00
kevinz000
49e52eee05 Merge pull request #9603 from Ghommie/Ghommie-cit267
Unmodularize lavaknights and emags.
2019-10-25 20:12:35 -07:00
kevinz000
275ecbf468 Merge pull request #9604 from Ghommie/Ghommie-cit268
Unmodularize job types
2019-10-25 20:10:39 -07:00
kevinz000
4eca1ca5ad Merge pull request #9605 from Ghommie/Ghommie-cit269
Unmodularize vox sounds
2019-10-25 20:09:52 -07:00
kevinz000
8b22c95479 Merge pull request #9606 from Ghommie/Ghommie-cit270
Unmodularize research.
2019-10-25 20:09:26 -07:00
kevinz000
9b7b2ce0b2 Merge pull request #9607 from Ghommie/Ghommie-cit271
Unmodularize events
2019-10-25 20:07:48 -07:00
BlackMajor
1705765555 Update hilbertshotel.dm 2019-10-25 23:02:09 +13:00
kevinz000
bd9443252a Merge pull request #9579 from YakumoChen/shapeshift
Ports #41638 and #43784, "Wizard Shapeshift now converts damage taken while transformed"
2019-10-24 19:13:54 -07:00
kevinz000
9096f03ad3 Merge pull request #8654 from Ghommie/Ghommie-cit54
ports in the Hilbert's Hotel.
2019-10-24 19:07:33 -07:00
kevinz000
da502aa31d Merge pull request #9535 from Ghommie/Ghommie-cit247
Fixing sniper rifles scope datum action oddity.
2019-10-24 19:05:25 -07:00
kevinz000
2a57a7c8a6 Merge pull request #9568 from r4d6/patch-3
[Fix]Make Cells not a viable replacement for the Stock Part Cheese
2019-10-24 19:04:15 -07:00
kevinz000
236cf328d1 Merge pull request #9567 from BlackMajor/Yote
Clockwork golems can now use guns
2019-10-24 19:03:49 -07:00
kevinz000
3e455f76e9 Merge pull request #9591 from Ghommie/Ghommie-cit261
Ports "Avoid generating the atom colour list on the lighting object"
2019-10-24 18:56:26 -07:00
kevinz000
9a74d91106 Merge pull request #9542 from Trilbyspaceclone/patch-231
Lowers Cargo most packs down to Pre- MK I Cargo rework*
2019-10-24 18:51:34 -07:00
kevinz000
d8fc3e7211 Merge pull request #9564 from kappa-sama/aliumtators
The syndicate are led by aliens.
2019-10-24 18:49:48 -07:00
kevinz000
02a1aaea34 Merge pull request #9548 from Ghommie/Ghommie-cit251
Fixing radio emotes conflict with drunk memes.
2019-10-24 18:48:33 -07:00
kevinz000
eb50df892a Merge pull request #9550 from Ghommie/Ghommie-cit253
Fixes temporary transformation sting triggering heart attacks on heartless humans.
2019-10-24 18:48:09 -07:00
kevinz000
4b2b3a26b3 Merge pull request #9577 from Feasel/patch-1
[Balance Pass] - Supermatter Mega Delam (Tesla)
2019-10-24 18:47:29 -07:00
kevinz000
d0e9f63734 Merge pull request #9585 from Ghommie/Ghommie-cit257
Fixes artificier lesser magic missile.
2019-10-24 18:46:27 -07:00
kevinz000
969bc83179 Merge pull request #9586 from BlackMajor/Yeehaw
Adds posibrains to the spawners menu for ghosts.
2019-10-24 18:45:57 -07:00
kevinz000
2ae111eaf0 Merge pull request #9587 from Ghommie/Ghommie-cit258
Porting components updates and fixing phantom thief component.
2019-10-24 18:38:39 -07:00
Ghommie
6fbe7f9086 unmodularize events 2019-10-24 23:41:31 +02:00
Ghommie
6f19899dd2 Unmodularize research. 2019-10-24 23:28:15 +02:00
Ghommie
0da6ae549f Unmodularize vox sounds 2019-10-24 23:02:21 +02:00
Ghommie
f035d77b53 Slips. 2019-10-24 22:50:53 +02:00
Ghommie
2a07bf95d8 Unmodularize job types 2019-10-24 22:44:40 +02:00
Ghommie
f01b5c853f Unmodularize lavaknights. 2019-10-24 22:08:36 +02:00
Ghommie
da03439ac8 Ports "New Revenant icons" 2019-10-24 12:21:37 +02:00
Ghommie
a50606bb67 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit259 2019-10-24 10:10:07 +02:00
Ghommie
4c8d7023c5 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit258 2019-10-24 09:50:20 +02:00
YakumoChen
3e9dfd6441 i was suggested to try this 2019-10-24 02:59:15 +00:00
YakumoChen
c6939864c1 and this 2019-10-24 02:42:38 +00:00
YakumoChen
5a9f0aa1e4 this too 2019-10-24 02:33:48 +00:00
YakumoChen
3ec63ed12d I think I forgot this 2019-10-24 02:32:21 +00:00
deathride58
f85f110baa Merge pull request #9047 from Poojawa/syntheticbloods
RGB Blood Reworks + Blood generator
2019-10-23 20:54:55 -04:00