c25508f1c2
turns dog/cat petting into an element.
2019-12-04 20:18:03 +01:00
07bd51f79a
Ports flag for bespoke elements.
2019-12-04 19:38:25 +01:00
e1717bb534
Merge branch 'master' into crow
2019-12-03 23:45:05 -05:00
fa270c8a79
leftovers.
2019-12-03 06:48:25 +01:00
6e318bfb09
Fixes traitor codewords highlight and some other hear signal hoonks.
2019-12-03 06:31:35 +01:00
3c7d2972de
Porting some return type annotations and bad keyword fixes, linter stuff.
2019-12-03 03:31:35 +01:00
8615c0ea8f
Merge branch 'Ghommie-cit394' of https://github.com/Ghommie/Citadel-Station-13 into Ghommie-cit394
2019-12-03 02:32:59 +01:00
04e9466465
and we don't have this span...
2019-12-01 16:06:13 -06:00
560ad9cce2
tfw we don't have these defines
2019-12-01 16:03:36 -06:00
ce04739ccb
neck slice
2019-12-01 15:53:40 -06:00
efbc85cb40
couple fxies
2019-12-01 15:39:55 -06:00
a20b975d68
copy paste errors lol
2019-12-01 14:40:25 -06:00
19b004edab
update butchering
2019-12-01 14:35:11 -06:00
f48d8016d5
Merge remote-tracking branch 'upstream/master' into Bloodsuckers
2019-12-01 13:51:57 +02:00
02048ce009
Bludsuckers
2019-11-29 21:28:14 +02:00
4183d00da2
Merge pull request #9966 from Ghommie/Ghommie-cit400
...
Ports elements: Lightweight shared/global components.
2019-11-28 23:08:32 -07:00
e6484a22a8
Ports tgstation loom changes, and durathred golems.
2019-11-29 05:34:17 +01:00
3b8aebbbc2
refactoring altclick interaction to allow parent calls without forcing the turf contents stat menu open.
2019-11-29 00:40:16 +01:00
1795072f94
Mistakes were made.
2019-11-28 02:47:09 +01:00
dd9116ee70
Ports elements: Lightweight shared/global components.
2019-11-28 01:47:20 +01:00
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
d43d996c38
ouch
2019-11-27 06:19:17 +01:00
c67f138d23
patching some combat mode edge cases and issues.
2019-11-27 06:10:08 +01:00
4e05c27cdb
Updating supply pods code.
2019-11-27 01:54:10 +01:00
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
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
c81d1fe7a3
Merge pull request #9867 from Ghommie/Ghommie-cit375
...
Ports "examine-code refactor"
2019-11-25 11:31:03 +13:00
a69b4b4916
removes creep
2019-11-23 02:28:31 -05:00
a7918717ff
fixes compile errors.
2019-11-22 18:22:53 -05:00
61299fee42
ready for review/testing
2019-11-22 15:32:09 -05:00
3544885b73
reverts fermis changes, woops.
2019-11-22 15:26:20 -05:00
c8e52fb8e1
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into disablesnolegs
2019-11-22 15:24:15 -05:00
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
b01be3b1ff
Merge branch 'master' into crow
2019-11-22 05:48:36 -05:00
2136968585
Ring ring
2019-11-21 21:55:17 -05:00
522a664f55
Merge pull request #9887 from Ghommie/Ghommie-cit385
...
Martial arts pacifism fixes and boxing buff, more ported pacifist fixes.
2019-11-22 02:39:29 +00:00
1ddb9935ff
Merge pull request #9530 from Ghommie/Ghommie-cit245
...
Touching up job outfits equip procs, little PDA fix.
2019-11-22 02:37:49 +00:00
863b2398ac
Removes the night vision quirk
2019-11-21 06:19:37 -05:00
84d1315a05
heck.
2019-11-20 21:33:35 +01:00
16d850ecfc
chain stunning yay
2019-11-20 21:17:31 +01:00
236f22096a
run
2019-11-20 21:13:08 +01:00
2fddf343ad
Run
2019-11-20 21:12:44 +01:00
67a48e0417
typo
2019-11-20 21:03:27 +01:00
aab7ad192b
Martial arts pacifism fixes and boxing buff, more ported pacifist fixes.
2019-11-20 21:00:17 +01:00
21f15e411d
Part 3
2019-11-19 19:34:42 +01:00
6e2ff6ce3c
Prevents storage bags from re-ordering their contents when items are removed.
2019-11-19 16:13:57 +01:00
f9b632019b
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into abductor-update
2019-11-18 21:39:45 -06:00
9f8547d42d
Another sync ( #4 )
...
AAAAAAAAA
2019-11-16 16:12:12 +01:00
21775ad3ee
Merge pull request #9813 from Ghommie/Ghommie-cit355
...
Ports "Ghosts can now see the AI's camera" and "Removes error message while shunting [fix]"
2019-11-16 01:24:58 -07:00
6aa6eaafe6
Merge branch 'master' into abductor-update
2019-11-15 23:24:51 +00:00
Ghommie