Commit Graph

5759 Commits

Author SHA1 Message Date
timothyteakettle 0706ac9d2a woops 2020-07-22 00:14:26 +01:00
timothyteakettle 6891bff9d3 further emotes 2020-07-22 00:07:15 +01:00
Timothy Teakettle 5c88253f93 lots more hats 2020-07-21 22:58:13 +01:00
silicons 286e5384d1 fix 2020-07-21 12:07:24 -07:00
silicons 2f11fb6a8b ok 2020-07-21 11:59:39 -07:00
silicons 9a5e53a21f ok 2020-07-21 11:57:47 -07:00
silicons 184e3992f3 fixes 2020-07-21 11:56:23 -07:00
Timothy Teakettle aea268548c some fixes 2020-07-21 19:54:42 +01:00
silicons 4d48abf3a6 fixes 2020-07-21 11:46:17 -07:00
Timothy Teakettle 0942b46796 more fashions 2020-07-21 18:43:58 +01:00
timothyteakettle 8e2c76db7c two more 2020-07-21 16:42:59 +01:00
timothyteakettle 99a2068dd2 its cool and hip 2020-07-21 16:26:51 +01:00
silicons 1450b11b01 sigh 2020-07-20 21:37:44 -07:00
timothyteakettle 4daf71d99e woo it works 2020-07-21 03:34:50 +01:00
timothyteakettle 47ff13c539 apply the overlay 2020-07-21 02:37:21 +01:00
timothyteakettle 1ed035e4a3 move 2020-07-21 02:29:41 +01:00
timothyteakettle 3e0403a7e9 BEEPSKY FASHION 2020-07-21 02:22:42 +01:00
Timothy Teakettle 75a2035774 Merge branch 'master' into wound-port 2020-07-21 01:10:51 +01:00
Lin f7355dde62 Merge pull request #12728 from silicons/vote
"I didn't see the map vote" - Adds a stat vote panel for plurality and approval voting as an alternative to the regular popups.
2020-07-20 18:17:45 -05:00
silicons 692656b02d Whew 2020-07-20 11:53:33 -07:00
silicons 526d257410 fix 2020-07-20 11:48:08 -07:00
silicons 416b989e12 changes 2020-07-20 11:35:10 -07:00
silicons 98d3ac80d9 :pika: 2020-07-20 11:25:17 -07:00
silicons d43a5cae26 let's refactor attack_hand. 2020-07-20 11:19:20 -07:00
silicons 984796b8c6 sigh 2020-07-20 10:46:52 -07:00
silicons 58e26c540c merge from master 2020-07-20 10:18:44 -07:00
silicons 6ab250dd03 sigh 2020-07-20 10:13:50 -07:00
silicons ae83a6df02 fix 2020-07-19 19:51:17 -07:00
BlackMajor f265b85d3b Merge pull request #12810 from lolman360/master
service borg fix/tweak
2020-07-20 11:42:59 +12:00
Timothy Teakettle 1b99cb9201 everything has the bonesetter 2020-07-19 18:32:44 +01:00
Timothy Teakettle ca6b289da6 fix tables and some minor thing 2020-07-19 17:49:22 +01:00
silicons 55f8e37544 sigh 2020-07-18 20:26:11 -07:00
silicons 910869d6bf more 2020-07-18 19:44:12 -07:00
silicons b1ccccb322 more 2020-07-18 18:51:16 -07:00
silicons 1a040dd2a6 changes 2020-07-18 18:44:17 -07:00
silicons 0c6368e3e7 e 2020-07-18 18:34:16 -07:00
silicons 0b98b0409b sigh 2020-07-18 18:29:09 -07:00
silicons 7c5d4f863d click cd breakout 2020-07-18 18:10:21 -07:00
silicons 3d65be4ee9 sigh 2020-07-18 18:03:17 -07:00
silicons 1ba6777b35 Whew 2020-07-18 17:49:06 -07:00
silicons 771a28e685 oh boy 2020-07-18 17:48:51 -07:00
Timothy Teakettle 1a5008fee7 Merge branch 'master' into wound-port 2020-07-18 23:06:49 +01:00
Lin ba3dc6a73b Merge pull request #12679 from silicons/unarmed_parry
Ok ok hear me out: Implements unarmed parry.
2020-07-18 17:02:02 -05:00
Timothy Teakettle 345c5c593d everyone but slimes can scar basically 2020-07-18 22:31:52 +01:00
Timothy Teakettle f290050a78 Merge branch 'wound-port' of https://github.com/timothyteakettle/Citadel-Station-13 into wound-port 2020-07-18 22:02:24 +01:00
Timothy Teakettle b184cfefc5 imagine allowing wound healing 2020-07-18 22:00:28 +01:00
Timothy Teakettle 974b80a2fd Merge branch 'master' into wound-port 2020-07-18 21:45:24 +01:00
Timothy Teakettle fe79c53f04 bugfixes 2020-07-18 21:40:19 +01:00
Lin e165524763 Merge pull request #12803 from Citadel-Station-13/silicons-patch-32
removes tango dancing
2020-07-18 11:17:42 -05:00
lolman360 55ed77a89d Update robot_modules.dm 2020-07-18 16:15:47 +10:00