nik707
dd62a9ca87
Merge pull request #10084 from Hatterhat/i-dont-test-my-code
...
i dont make good code
2019-12-19 14:10:18 -06:00
Putnam3145
b8c5290011
Merge pull request #10026 from Linzolle/neck-slice
...
Neck slice
2019-12-17 11:58:00 -08:00
Ghommie
6b7dcbceb0
Porting a few martial art code updates.
2019-12-17 03:19:07 +01:00
Lin
237fbaa02d
Merge pull request #10180 from Ghommie/Ghommie-cit462
...
[s] virtual reality component improvements, fixes and documentation.
2019-12-17 01:05:10 +00:00
Putnam3145
c39a5d0462
Merge pull request #10011 from Arturlang/Bloodsuckers
...
Bloodsuckers, or, yknow, vampires.
2019-12-15 14:41:36 -08:00
Ghommie
80f47872d7
My head splodes.
2019-12-15 20:31:36 +01:00
Ghommie
081d3df750
This is one serious Pepe Silvia complex.
2019-12-14 22:52:40 +01:00
Ghommie
e5d45faee8
deadchat, not deathchat.
2019-12-14 18:53:53 +01:00
Ghommie
3891c91799
virtual reality component improvements, fixes and documentation.
2019-12-14 17:19:48 +01:00
Hatterhat
44ed639169
i should probably write an actual changelog for this
2019-12-13 22:16:50 -06:00
Artur
9773b530f8
More fixes. Urgh
2019-12-08 21:47:25 +02:00
Artur
4711eb0987
Merge remote-tracking branch 'upstream/master' into Bloodsuckers
2019-12-07 15:53:11 +02:00
Ghommie
7cc332960b
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit329
2019-12-07 05:30:07 +01:00
Hatterhat
d1bfe3d840
i hate
2019-12-06 21:43:15 -06:00
Artur
19ab4a5f70
Review fixes and tweaks
2019-12-07 00:43:02 +02:00
Putnam3145
4e022af46f
Merge pull request #10056 from Ghommie/Ghommie-cit430
...
Ports "Slightly improves visible and audible messages."
2019-12-05 21:16:47 -08:00
kevinz000
6a305dfe4f
Merge pull request #9955 from Ghommie/Ghommie-cit394
...
Updating supply pods code.
2019-12-05 21:54:42 -07:00
Putnam3145
6b2d3b116d
Merge branch 'master' into Ghommie-cit430
2019-12-05 20:53:14 -08:00
kevinz000
f937c4d877
Merge pull request #10046 from Ghommie/Ghommie-cit424
...
Ports flag for bespoke elements.
2019-12-05 21:50:19 -07:00
Putnam3145
3633c6936d
Merge pull request #10052 from Ghommie/Ghommie-cit428
...
Banishes some "me" emote magic numbers from this realm.
2019-12-05 20:47:39 -08:00
kevinz000
5048995a58
Merge pull request #9993 from Ghommie/Ghommie-cit412
...
Ports tgstation loom changes, and durathred golems.
2019-12-05 21:44:25 -07:00
kevinz000
29497320c1
Merge pull request #10025 from Linzolle/butchering
...
refactor butchering component
2019-12-05 21:19:57 -07:00
Ghommie
5024e900f7
Ooow fuck.
2019-12-06 02:45:55 +01:00
Ghommie
9ca7bb759c
Ports "Slightly improves visible and audible messages."
2019-12-06 02:02:12 +01:00
Ghommie
7958cfa548
Right file
2019-12-06 00:27:50 +01:00
BlackMajor
a6f48ea74c
Merge pull request #9372 from Weblure/Xenobio-Hotkeys
...
[Ready] [Test Merge] Ports Xenobio Hotkeys
2019-12-06 11:29:34 +13:00
Ghommie
53ff425f04
Banishes some magic numbers from this realm.
2019-12-05 21:55:28 +01:00
Artur
82d1497ddc
Fixes bad buds and toxin healing
2019-12-05 17:29:00 +02:00
Ghommie
07bd51f79a
Ports flag for bespoke elements.
2019-12-04 19:38:25 +01:00
Ghommie
8615c0ea8f
Merge branch 'Ghommie-cit394' of https://github.com/Ghommie/Citadel-Station-13 into Ghommie-cit394
2019-12-03 02:32:59 +01:00
Putnam3145
8da17c5aaf
Merge pull request #9946 from Citadel-Station-13/kevinz000-patch-117
...
Removes hyperspeed from light pink stabilized for -4.5 stam/tick + free sprint
2019-12-01 23:12:35 -08:00
Linzolle
ce04739ccb
neck slice
2019-12-01 15:53:40 -06:00
Linzolle
19b004edab
update butchering
2019-12-01 14:35:11 -06:00
Artur
f48d8016d5
Merge remote-tracking branch 'upstream/master' into Bloodsuckers
2019-12-01 13:51:57 +02:00
Artur
9b20879ba5
Ditto
2019-12-01 00:07:07 +02:00
Artur
02048ce009
Bludsuckers
2019-11-29 21:28:14 +02:00
kevinz000
4183d00da2
Merge pull request #9966 from Ghommie/Ghommie-cit400
...
Ports elements: Lightweight shared/global components.
2019-11-28 23:08:32 -07:00
Ghommie
e6484a22a8
Ports tgstation loom changes, and durathred golems.
2019-11-29 05:34:17 +01:00
Linzolle
829cc3d81c
Revert "Merge pull request #9613 from Linzolle/hat-toss"
...
This reverts commit d67b7f620ddabfba8a0d
2019-11-27 20:23:33 -06:00
Ghommie
dd9116ee70
Ports elements: Lightweight shared/global components.
2019-11-28 01:47:20 +01:00
Ghommie
f9680130f9
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit329
2019-11-27 18:48:20 +01:00
Ghommie
4e05c27cdb
Updating supply pods code.
2019-11-27 01:54:10 +01:00
kevinz000
4ffe9cd464
Update traits.dm
2019-11-25 22:53:22 -07:00
BlackMajor
786d40032d
Merge pull request #9922 from GrayRachnid/braintraumasport
...
Ports new Brain Traumas from /tg/. Does not include the shitty creeper antag or Wizard Traumas, i'm porting wizard traumas later. Also adds the Desynchronizer and changes the way some heaRing args are handled.
2019-11-25 12:31:15 +13:00
BlackMajor
6f98efb18e
Merge pull request #9902 from Useroth/new-tg-plants
...
[TESTMERGE READY] Ported a bunch of tg hydroponics content.
2019-11-25 11:30:43 +13:00
kevinz000
75510d8da9
Merge pull request #9749 from Trilbyspaceclone/patch-238
...
What do you mean I cant hold the armory on my back? -BOH nerf
2019-11-23 11:42:37 -07:00
GrayRachnid
c8e52fb8e1
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into disablesnolegs
2019-11-22 15:24:15 -05:00
Useroth
2ced7db508
Ported a bunch of tg hydroponic stuff.
2019-11-21 10:53:57 +01:00
kevinz000
8df8acb1b7
Merge pull request #9811 from Ghommie/Ghommie-cit353
...
Dreamchecker compatibility changes, part 2.
2019-11-20 21:49:58 -07:00
kevinz000
755559bb66
Merge pull request #9836 from Ghommie/Ghommie-cit364
...
Ports "Uses defines for turf atmos"
2019-11-19 21:32:42 -07:00
