Ghommie
395457f7ef
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit471
2019-12-21 17:59:32 +01:00
Ghommie
6b7dcbceb0
Porting a few martial art code updates.
2019-12-17 03:19:07 +01:00
Ghommie
80402a0d88
Ports some hud and update_icon code updates.
2019-12-16 23:29:20 +01:00
Ghommie
aab7ad192b
Martial arts pacifism fixes and boxing buff, more ported pacifist fixes.
2019-11-20 21:00:17 +01:00
Fermi
c23d6f0113
I missed an earlier port.
2019-09-17 01:08:37 +01:00
TrilbySpaceClone
7ca32cd97f
port 2
2019-07-29 07:28:38 -04:00
Arturlang
69a62314e9
Defines so carp reroutes the deflects
2019-06-28 11:37:12 +03:00
Ghommie
d3d2b8d898
should be ready.
2019-06-06 19:24:20 +02:00
Poojawa
b6430559e9
datums
2018-09-11 02:49:41 -05:00
LetterJay
5f27ac30c7
Merge branch 'master' into upstream-merge-37582
2018-05-22 07:22:42 -05:00
ShizCalev
b5a95e9da8
Makes more messages pronoun sensitive
2018-05-03 17:46:25 -05:00
oranges
7d45e045a3
Uppercases slot defines.
2018-04-27 20:14:39 -05:00
Armhulen
2d8b007086
Refactors Spell and Martial Art Books to use Action Granters!
2018-03-28 12:18:06 -05:00
CitadelStationBot
3d26cd4a6f
[MIRROR] Replaced body zone magic strings with defines ( #6004 )
...
* Replaced body zone magic strings with defines
* merge conflicts
2018-03-19 21:18:57 -05:00
deathride58
2e84b30841
Makes martial arts use Knockdown() instead of Stun() for their stuns ( #5617 )
2018-02-23 19:19:23 -06:00
Poojawa
03086dfa91
Tg 1 28 sync testing/confirmation ( #5178 )
...
* maps, tgui, tools
* defines and helpers
* onclick and controllers
* datums
fucking caught that hulk reversal too.
* game and shuttle modular
* module/admin
* oh god they fucking moved antag shit again
* haaaaate. Haaaaaaaaaate.
* enables moff wings
* more modules things
* tgstation.dme
before I forget something important
* some mob stuff
* s'more mob/living stuff
* some carbon stuff
* ayy lmaos and kitchen meat
* Human stuff
* species things
moff wings have a 'none' version too
* the rest of the module stuff.
* some strings
* misc
* mob icons
* some other icons.
* It compiles FUCK BORERS
FUCK BORERS
2018-01-29 04:42:29 -06:00
LetterJay
2e6b034493
save point - a lot of shit to fix
2017-12-27 07:03:40 -06:00
Jordan Brown
164db7ae9b
Prefixed all disability defines with DISABILITY_ to fix a name collision
2017-12-24 15:03:30 -06:00
XDTM
3af0aa2489
[Ready Again]Refactors disabilities into lists, allowing for independent disability sources
2017-12-18 15:19:53 -06:00
XDTM
988dbe87da
Brain Traumas
2017-12-06 12:05:20 -06:00
oranges
9bd56416f8
Merge pull request #31500 from Armhulen/patch-7
...
sleeping carp grabs now put out a message
2017-10-12 00:29:14 -05:00
Jordan Brown
075cb673c0
Remove drop_item, drop_item_v, put_in_hands_or_del
2017-10-07 12:37:06 -05:00
kevinz000
3254fcf535
goddamnit_again ( #2511 )
2017-08-26 18:43:57 -07:00
LetterJay
188193eb61
here we go again ( #2456 )
2017-08-24 19:24:25 -07:00
CitadelStationBot
dd22c79678
Completes major inhand split project ( #2178 )
2017-08-02 06:30:33 -05:00
Poojawa
b1b4826c0c
July 5th TG sync ( #1883 )
...
July 5th TG sync
2017-07-05 22:14:19 -05:00
CitadelStationBot
25df88509a
Reorganizes martial arts and stores them in the MIND.
2017-05-22 07:13:10 -05:00
