Commit Graph
100 Commits
Author SHA1 Message Date
kevinz000 e4eb49050c Merge remote-tracking branch 'citadel/master' into combat_rework 2020-05-24 15:03:06 -07:00
GhomandGitHub 75dec8ce2c Ports "Removes the absolute istype fest from footsteps" (#12259)
* Ports "Removes the absolute istype fest from footsteps"

* Update species.dm
2020-05-18 04:46:22 -07:00
LinandGitHub 0d92783a91 oops. (#12242) 2020-05-14 00:22:57 +02:00
LinandGitHub fd30edca9c infinixeno (#12234) 2020-05-13 03:18:25 +02:00
Ghommie a412e840f7 'mob_run_block' and 'mob_check_block' macros 2020-05-08 18:52:32 +02:00
kevinz000 f034c7c536 Merge remote-tracking branch 'citadel/master' into combat_rework 2020-05-05 17:38:43 -07:00
kevinz000 5984fa02b8 more changes 2020-04-22 08:49:21 -07:00
kevinz000 d259519bff changes 2020-04-22 08:31:09 -07:00
kevinz000 0eac988f52 okay! 2020-04-22 08:22:52 -07:00
Linzolle 39e6541ccd remove bad words 2020-04-14 17:54:07 -05:00
Linzolle f828f4c4b7 Merge remote-tracking branch 'forrest/wewlad' into tos-compliance 2020-04-14 17:33:47 -05:00
Ghommie 31e0321808 Minor action datum refactor and spellcasting fix. 2020-04-11 16:53:08 +02:00
ForrestWick 0a54f8a7a0 I'M SORRY MR GITHUB PLS DONT BEAT ME 2020-04-09 17:27:18 -05:00
kevinz000 4391fc3714 pixel shifting 2020-03-26 12:51:17 -07:00
kevinz000 c14b1c2857 linter 2020-03-16 14:18:47 -07:00
kevinz000 a77be038b8 refactoring this whole thing again 2020-03-16 04:56:32 -07:00
kevinz000 2113b63428 o boy 2020-03-14 21:42:23 -07:00
kevinz000 1d198aca88 CHECK_MOBILITY 2020-03-03 20:41:08 -07:00
kevinz000 424eb48d9e fixes 2020-02-24 01:59:45 -07:00
kevinz000 611fd7ea89 Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-01-27 23:35:35 -07:00
Ghommie 524f665f4a fix for hypospray jank. 2020-01-24 02:17:41 +01:00
kevinz000 f85527ab4b Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-01-19 16:18:12 -07:00
kevinz000 7bcb37c5d1 Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-01-16 21:12:56 -07:00
kevinz000 9ef4cbfa76 refactor tags 2020-01-16 20:58:00 -07:00
Ghommie c14439494a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2020-01-12 19:18:03 +01:00
AffectedArc07 16a37e2769 Standardises all files from CRLF to LF 2020-01-12 14:28:01 +00:00
kevinz000 f1a4956afc easier for me to type 2020-01-10 13:26:34 -08:00
kevinz000 830054c106 sigh 2020-01-10 13:25:47 -08:00
kevinz000 e4cfb1fa39 more 2020-01-07 12:03:46 -08:00
kevinz000 ae73927b67 patches 2020-01-07 02:39:16 -08:00
kevinz000 c77005af8a changes 2020-01-06 04:17:53 -08:00
kevinz000 a8cc37eaf0 ok 2020-01-06 03:57:58 -08:00
kevinz000 7378d91684 ([\W\.])Knockdown\( 2020-01-06 03:39:20 -08:00
Ghommie 686a76dd1d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2020-01-04 13:35:05 +01:00
Ghommie bddb437872 It works now. 2019-11-18 18:30:46 +01:00
Ghommie 6e9d2d57c0 check_shields from human to living, part 2 2019-11-17 22:06:19 +01:00
Ghommie b560ff8284 refactoring code to allow all living mobs to use shields. 2019-11-17 06:23:12 +01:00
Ghommie 09860d463f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2019-11-10 23:23:36 +01:00
Ghommie ad7101d0aa ports anti-magic component code updates (holymelon not included). 2019-10-25 03:20:42 +02:00
Ghommie 2c578ca683 Ports move force and move resist, movement/pushing/pulling tweaks & co. 2019-10-24 18:01:46 +02:00
Ghommie 2b224400e3 Adds in worn overlays for different types of cuffs. 2019-07-29 04:31:27 +02:00
Ghommie 589cdae0e1 Towels 2019-07-18 00:03:49 +02:00
Ghommie 129ca9d71f Ports "Refactors NODROP flag into TRAIT_NODROP" 2019-07-13 10:27:39 +02:00
Poojawa 284e9d0325 module things, jfc 2018-09-11 07:51:01 -05:00
deathride58 b1688405d9 and finally, the modules folder. Now I can publish and take a break 2018-07-02 01:19:37 -04:00
orangesandletterjay 1d0f775f56 Merge pull request #38360 from ShizCalev/key-cleanup
Cleans up some logging
2018-06-11 22:29:27 -05:00
LetterJayandGitHub 5f27ac30c7 Merge branch 'master' into upstream-merge-37582 2018-05-22 07:22:42 -05:00
ShizCalevandCitadelStationBot b5a95e9da8 Makes more messages pronoun sensitive 2018-05-03 17:46:25 -05:00
orangesandCitadelStationBot 7d45e045a3 Uppercases slot defines. 2018-04-27 20:14:39 -05:00
Poojawaanddeathride58 5fa001c10f things with stuff (#6233)
* buncha things from upstream

* datums globals, onclick

* datums

* game folder, holy shit mirror bot why

* modules

* icons

* dme

* compiles cleanly

* tools purge

* updates maps

* double check just because. and wew lad

* incidentally, this needs more work first

* some things

* weh

* sound cleanup and icons

* reeeee

* compile issues

* oh look, fresh code sync

* cleans up some unused icons

* dirty vars

* reeeeeeeeeeeeeeee

* wew lad. fuck off with this already
2018-04-07 23:07:09 -04:00