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
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
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
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
daf4acbceb
Merge pull request #9599 from Ghommie/Ghommie-cit264
...
Ports "New Revenant icons"
2019-10-25 20:13:05 -07:00
49e52eee05
Merge pull request #9603 from Ghommie/Ghommie-cit267
...
Unmodularize lavaknights and emags.
2019-10-25 20:12:35 -07:00
275ecbf468
Merge pull request #9604 from Ghommie/Ghommie-cit268
...
Unmodularize job types
2019-10-25 20:10:39 -07:00
4eca1ca5ad
Merge pull request #9605 from Ghommie/Ghommie-cit269
...
Unmodularize vox sounds
2019-10-25 20:09:52 -07:00
8b22c95479
Merge pull request #9606 from Ghommie/Ghommie-cit270
...
Unmodularize research.
2019-10-25 20:09:26 -07:00
9b7b2ce0b2
Merge pull request #9607 from Ghommie/Ghommie-cit271
...
Unmodularize events
2019-10-25 20:07:48 -07:00
f983db61bf
Update halloween.dm
2019-10-25 18:08:33 -04:00
5bafab9447
missing period
2019-10-25 16:34:32 -05:00
8fb0a68feb
Adds Hat Throwing ( #45355 )
...
* adds hat throwing on people and borgs
* clothing flags, hats can knock off non-items, borg hat blacklist check
* prevents hats with items in them from being able to land on heads
* removes extra equip, hats can go on the hatless again, tinfoil fix
* if
* bit flag
2019-10-25 16:19:19 -05:00
9e89e898ee
not again
2019-10-25 15:58:10 -05:00
50b9ae3cf3
Update large_objects.dm
2019-10-25 09:39:00 -07:00
8f1c983b25
Update armory.dm
2019-10-25 09:36:54 -07:00
79c3700d25
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit156
2019-10-25 12:42:28 +02:00
cb74be29ae
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit262
2019-10-25 12:40:50 +02:00
514b023779
kev request: admin ooc is no bigger.
2019-10-25 12:30:05 +02:00
1705765555
Update hilbertshotel.dm
2019-10-25 23:02:09 +13:00
dcb4c6ae04
Merge branch 'master' into assu
...
...and its still coming together...
2019-10-25 10:31:07 +03:00
dbaf5a54e6
Merge branch 'master' into abductor-update
2019-10-25 06:17:24 +00:00
bb9b0ce312
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into super-special-awesome-dynamic
2019-10-24 22:38:33 -07:00
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
9096f03ad3
Merge pull request #8654 from Ghommie/Ghommie-cit54
...
ports in the Hilbert's Hotel.
2019-10-24 19:07:33 -07:00
da502aa31d
Merge pull request #9535 from Ghommie/Ghommie-cit247
...
Fixing sniper rifles scope datum action oddity.
2019-10-24 19:05:25 -07:00
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
236cf328d1
Merge pull request #9567 from BlackMajor/Yote
...
Clockwork golems can now use guns
2019-10-24 19:03:49 -07:00
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
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
d8fc3e7211
Merge pull request #9564 from kappa-sama/aliumtators
...
The syndicate are led by aliens.
2019-10-24 18:49:48 -07:00
02a1aaea34
Merge pull request #9548 from Ghommie/Ghommie-cit251
...
Fixing radio emotes conflict with drunk memes.
2019-10-24 18:48:33 -07:00
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
4b2b3a26b3
Merge pull request #9577 from Feasel/patch-1
...
[Balance Pass] - Supermatter Mega Delam (Tesla)
2019-10-24 18:47:29 -07:00
d0e9f63734
Merge pull request #9585 from Ghommie/Ghommie-cit257
...
Fixes artificier lesser magic missile.
2019-10-24 18:46:27 -07:00
969bc83179
Merge pull request #9586 from BlackMajor/Yeehaw
...
Adds posibrains to the spawners menu for ghosts.
2019-10-24 18:45:57 -07:00
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
9fd3ef7801
Merge branch 'magrifles_again' of github.com-kevinz000:Citadel-Station-13/Citadel-Station-13 into magrifles_again
2019-10-24 18:36:04 -07:00
ad7101d0aa
ports anti-magic component code updates (holymelon not included).
2019-10-25 03:20:42 +02:00
31f9ed9665
fixes
2019-10-24 15:31:45 -07:00
6fbe7f9086
unmodularize events
2019-10-24 23:41:31 +02:00
6f19899dd2
Unmodularize research.
2019-10-24 23:28:15 +02:00
0da6ae549f
Unmodularize vox sounds
2019-10-24 23:02:21 +02:00
f035d77b53
Slips.
2019-10-24 22:50:53 +02:00
2a07bf95d8
Unmodularize job types
2019-10-24 22:44:40 +02:00
f01b5c853f
Unmodularize lavaknights.
2019-10-24 22:08:36 +02:00
507e9b7aa0
kinda a dumb workaround
2019-10-24 13:57:00 -05:00
b29fc9aa58
fermis code looks very 2k17, sad.
2019-10-24 20:44:29 +02:00
deaf1a0e00
guess tahts what ghom meant
2019-10-24 12:14:22 -05:00
5e1658445c
that doesn't exist
2019-10-24 12:11:58 -05:00
deathride58