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
b8bb0f2924
Merge pull request #10048 from Ghommie/Ghommie-cit426
...
Demodularize moodlets.
2019-12-05 21:56:29 -07: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
d217a9f445
Merge pull request #10032 from Ghommie/Ghommie-cit418
...
Porting some return type annotations and bad keyword fixes.
2019-12-05 21:33:12 -07:00
kevinz000
bbd482015c
Merge pull request #10033 from Ghommie/Ghommie-cit419
...
Fixes traitor codewords highlight and some other hear signal hooks.
2019-12-05 21:28:03 -07:00
kevinz000
29497320c1
Merge pull request #10025 from Linzolle/butchering
...
refactor butchering component
2019-12-05 21:19:57 -07:00
Ghommie
9ca7bb759c
Ports "Slightly improves visible and audible messages."
2019-12-06 02:02:12 +01: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
77ef3dabea
Demodularize moodlets.
2019-12-04 23:10:39 +01:00
Trilbyspaceclone
73891a02bc
messenger
2019-12-04 16:56:27 -05:00
Ghommie
dfa57173db
D'aww, a mistake...
2019-12-04 20:20:01 +01:00
Ghommie
c25508f1c2
turns dog/cat petting into an element.
2019-12-04 20:18:03 +01:00
Ghommie
07bd51f79a
Ports flag for bespoke elements.
2019-12-04 19:38:25 +01:00
TrilbySpaceClone
e1717bb534
Merge branch 'master' into crow
2019-12-03 23:45:05 -05:00
Ghommie
fa270c8a79
leftovers.
2019-12-03 06:48:25 +01:00
Ghommie
6e318bfb09
Fixes traitor codewords highlight and some other hear signal hoonks.
2019-12-03 06:31:35 +01:00
Ghommie
3c7d2972de
Porting some return type annotations and bad keyword fixes, linter stuff.
2019-12-03 03:31:35 +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
Linzolle
04e9466465
and we don't have this span...
2019-12-01 16:06:13 -06:00
Linzolle
560ad9cce2
tfw we don't have these defines
2019-12-01 16:03:36 -06:00
Linzolle
ce04739ccb
neck slice
2019-12-01 15:53:40 -06:00
Linzolle
efbc85cb40
couple fxies
2019-12-01 15:39:55 -06:00
Linzolle
a20b975d68
copy paste errors lol
2019-12-01 14:40:25 -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
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
Ghommie
3b8aebbbc2
refactoring altclick interaction to allow parent calls without forcing the turf contents stat menu open.
2019-11-29 00:40:16 +01:00
Ghommie
1795072f94
Mistakes were made.
2019-11-28 02:47:09 +01: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
d43d996c38
ouch
2019-11-27 06:19:17 +01:00
Ghommie
c67f138d23
patching some combat mode edge cases and issues.
2019-11-27 06:10:08 +01:00
Ghommie
4e05c27cdb
Updating supply pods code.
2019-11-27 01:54:10 +01:00
Linzolle
cc54e5230f
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into abductor-update
2019-11-25 21:01:25 -06: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
c81d1fe7a3
Merge pull request #9867 from Ghommie/Ghommie-cit375
...
Ports "examine-code refactor"
2019-11-25 11:31:03 +13:00
GrayRachnid
a69b4b4916
removes creep
2019-11-23 02:28:31 -05:00
GrayRachnid
a7918717ff
fixes compile errors.
2019-11-22 18:22:53 -05:00
GrayRachnid
61299fee42
ready for review/testing
2019-11-22 15:32:09 -05:00
GrayRachnid
3544885b73
reverts fermis changes, woops.
2019-11-22 15:26:20 -05: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
Trilbyspaceclone
febceaa2d6
Apply suggestions from code review
...
grammar
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com >
2019-11-22 14:39:31 -05:00
TrilbySpaceClone
b01be3b1ff
Merge branch 'master' into crow
2019-11-22 05:48:36 -05:00
