Commit Graph

3389 Commits

Author SHA1 Message Date
kevinz000 f647fe92fa Merge pull request #11810 from Citadel-Station-13/Ghommie-patch-4
Re-enables hulks.
2020-04-12 17:01:22 -07:00
Ghommie 05a954f000 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit611 2020-04-13 02:01:01 +02:00
kevinz000 d60932ca5d Merge pull request #11697 from Ghommie/Ghommie-cit655
Ports "Obliterates item_color: new washing machine functionality edition"
2020-04-12 16:16:37 -07:00
Seris02 1b7f34d230 yeet 2020-04-12 16:43:54 +08:00
Ghommie acb5c39b59 Fixes the phantom thief component for the Xth time. 2020-04-12 07:47:28 +02:00
Ghom fc58a34248 Merge pull request #11823 from Putnam3145/contam-buff
Bringing contamination back
2020-04-12 06:29:40 +02:00
Ghom 3f573fb611 Merge pull request #11814 from kappa-sama/patch-19
fixes stomping and increases Stam damage from krav
2020-04-12 06:24:57 +02:00
Ghom 28642ce39c Merge pull request #11816 from necromanceranne/broke_dodging
fixes rising bass and sleeping carp not dodging
2020-04-12 06:23:47 +02:00
Ghommie fe4b270568 Sprite size preferences?! Oh no! 2020-04-12 05:08:49 +02:00
Putnam a779ec2411 Makes contamination work (whoops) 2020-04-11 12:42:25 -07:00
Ghommie 31e0321808 Minor action datum refactor and spellcasting fix. 2020-04-11 16:53:08 +02:00
spookydonut 230e5fca20 fix everything 2020-04-11 15:32:09 +08:00
necromanceranne b6d079f91f fixes rising bass and sleeping carp not dodging 2020-04-11 13:00:32 +10:00
kevinz000 b21598a441 fix 2020-04-10 12:47:16 -07:00
kevinz000 bf1ffb7ebd Merge branch 'storage_rework' of github.com-kevinz000:kevinz000/Citadel-Station-13 into storage_rework 2020-04-10 12:44:28 -07:00
kevinz000 3788496204 multiline support 2020-04-10 12:42:50 -07:00
kappa-sama 2afda4c216 forgot oop 2020-04-10 14:24:20 -04:00
kappa-sama 91726f340a Update krav_maga.dm 2020-04-10 14:08:16 -04:00
Artur 38d1634e13 Weh 2020-04-10 21:07:15 +03:00
Artur f481be1496 Makin stuff nice and dandy 2020-04-10 20:53:28 +03:00
Arturlang b40fb55539 Fixes mesmerzie and makes it work better (#11785)
* Weh

* Mesmerize works a lot nicer now
2020-04-10 15:41:35 +02:00
Ghom a38e6e88a0 Enables hulk smash. 2020-04-10 14:07:39 +02:00
kevinz000 a02bad15ea Update stack.dm 2020-04-10 04:45:28 -07:00
kevinz000 6705fc9724 Update rped.dm 2020-04-10 04:45:19 -07:00
kevinz000 a9f6ac4131 default to legacy 2020-04-10 04:42:51 -07:00
kevinz000 84c8183ccb k 2020-04-10 04:42:34 -07:00
kevinz000 bc16600070 alternative way 2020-04-10 04:00:59 -07:00
kevinz000 165379c0b8 storage 2020-04-10 02:19:19 -07:00
kevinz000 36cd3b4c35 i should have just ported from baystation instead of reinventing the fricking wheel 2020-04-10 01:23:36 -07:00
kevinz000 e2440034f5 matrices.. 2020-04-10 01:07:53 -07:00
kevinz000 d658a0c1d4 k 2020-04-10 00:21:40 -07:00
kevinz000 be398004b7 groan 2020-04-10 00:16:43 -07:00
kevinz000 a9e738b8b1 k 2020-04-09 23:14:07 -07:00
kevinz000 9b13f009fe k 2020-04-09 23:12:37 -07:00
kevinz000 ffe206f3e1 k 2020-04-09 22:33:54 -07:00
kevinz000 00ebd842b8 k 2020-04-09 22:17:42 -07:00
kevinz000 a559fef230 runtime 2020-04-09 22:12:39 -07:00
kevinz000 0a67f5c6ea compile 2020-04-09 21:30:42 -07:00
ForrestWick 0a54f8a7a0 I'M SORRY MR GITHUB PLS DONT BEAT ME 2020-04-09 17:27:18 -05:00
Artur fe755a1424 Tackling Working so far, working on the lunge now 2020-04-09 21:42:00 +03:00
Timothy Teakettle cfec83b8a2 what if butchering didnt suck! 2020-04-09 18:38:29 +01:00
kevinz000 857716c473 k 2020-04-09 09:30:28 -07:00
kevinz000 e6f98fa270 compile 2020-04-09 09:16:46 -07:00
Timothy Teakettle 7fe5bb71d7 more quality 2020-04-09 16:07:45 +01:00
Ghommie 7c1e5aa2c9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit655 2020-04-09 15:46:19 +02:00
Putnam3145 5078b5875a Fixes my oldish badcode. (#11781) 2020-04-09 14:48:58 +02:00
kevinz000 7cb2057bb0 Merge pull request #11751 from Arturlang/kills_the_shitty_fix
TGUI Next vendors plus spritesheet port from TG
2020-04-09 03:53:08 -07:00
kevinz000 e3c6ebb81e compile 2020-04-09 02:54:29 -07:00
kevinz000 a888c7c29a continue 2020-04-09 02:52:32 -07:00
kevinz000 f60cf32562 Merge pull request #11775 from Trilbyspaceclone/frail-crafting
Frail crafting - Glass work additions and changes!
2020-04-09 02:41:01 -07:00