 Timothy Teakettle
|
a89a55a0cc
|
indentation fix
|
2020-07-18 23:23:25 +01:00 |
|
|
TheSpaghetti
|
16957d78e9
|
Makes the grammar bad again.
For some reason the fixed grammar didn't compile.
|
2020-07-18 18:11:48 -04: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
|
3b78ac58bd
|
make it clearer
|
2020-07-18 22:46:07 +01:00 |
|
|
kappa-sama
|
f2e039a743
|
back up to 5
|
2020-07-18 17:42:35 -04:00 |
|
|
Timothy Teakettle
|
345c5c593d
|
everyone but slimes can scar basically
|
2020-07-18 22:31:52 +01:00 |
|
|
Timothy Teakettle
|
74eadcf9c2
|
removes a singular full stop
|
2020-07-18 22:25:42 +01:00 |
|
|
Timothy Teakettle
|
50b346355c
|
fixes travis but without dm fucking up
|
2020-07-18 22:13:15 +01:00 |
|
|
Timothy Teakettle
|
35b5c019a5
|
Revert "travis please"
This reverts commit b712538e69.
|
2020-07-18 22:12:01 +01:00 |
|
|
Timothy Teakettle
|
b712538e69
|
travis please
|
2020-07-18 22:10:08 +01:00 |
|
|
Timothy Teakettle
|
c1ac3bae6e
|
appease travis
|
2020-07-18 22:06:07 +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
|
de83bbee0b
|
woops
|
2020-07-18 22:02:07 +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 |
|
|
silicons
|
56f56d5cbe
|
Update gateway.dm
|
2020-07-18 10:24:36 -07: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 |
|
|
Putnam
|
d88ade40bf
|
actually fixes uplink
|
2020-07-18 01:51:59 -07:00 |
|
|
kappa-sama
|
0364fe8579
|
lower cost
|
2020-07-18 03:50:17 -04:00 |
|
|
kappa-sama
|
c39a517519
|
nerf this
|
2020-07-18 03:47:31 -04:00 |
|
|
BlackMajor
|
4635f8aefb
|
fixes not being able to pick up chem/bio bags
|
2020-07-18 19:34:11 +12:00 |
|
|
lolman360
|
55ed77a89d
|
Update robot_modules.dm
|
2020-07-18 16:15:47 +10:00 |
|
|
lolman360
|
f696a461af
|
Update RSF.dm
|
2020-07-18 16:10:25 +10:00 |
|
|
lolman360
|
f84b044f34
|
Update robot_modules.dm
|
2020-07-18 16:05:57 +10:00 |
|
|
lolman360
|
0e38e1ff39
|
e
|
2020-07-18 16:03:32 +10:00 |
|
|
BlackMajor
|
68475fe301
|
Forgot to let borgs use the iv drip
|
2020-07-18 17:39:41 +12:00 |
|
|
BlackMajor
|
f68962e9d3
|
This is a bad idea
|
2020-07-18 16:46:08 +12:00 |
|
|
timothyteakettle
|
74b2764591
|
sprites and some missed things
|
2020-07-18 03:08:03 +01:00 |
|
|
Keate Senior
|
d65f0e956c
|
replaces the abscond default quickbind to gateway default quickbind
|
2020-07-17 21:54:05 -04:00 |
|
|
timothyteakettle
|
e8fade4f7f
|
changes
|
2020-07-18 02:29:12 +01:00 |
|
|
timothyteakettle
|
8bb9b11922
|
Merge branch 'wound-port' of https://github.com/timothyteakettle/Citadel-Station-13 into wound-port
|
2020-07-18 01:26:41 +01:00 |
|
|
timothyteakettle
|
7714fcfaba
|
more changes
|
2020-07-18 01:26:38 +01:00 |
|
|
CameronWoof
|
431c52b7e2
|
Merge remote-tracking branch 'upstream/master' into advanced-sutures-and-mesh
|
2020-07-17 17:22:43 -07:00 |
|
|
silicons
|
b98102a824
|
Merge pull request #12762 from zeroisthebiggay/a
drops martial art minpops down to twenty pop
|
2020-07-17 17:11:02 -07:00 |
|
|
silicons
|
a8e2b84ad8
|
Merge pull request #12763 from zeroisthebiggay/b
hopefully fixes records possibly
|
2020-07-17 17:10:40 -07:00 |
|
|
silicons
|
c924290cd1
|
Merge pull request #12733 from TheObserver-sys/Finally,moreblorble
Slime Extractification
|
2020-07-17 17:10:32 -07:00 |
|
|
silicons
|
044525519a
|
Merge pull request #12750 from timothyteakettle/loadout-plushies
replaces plushies in the loadout menu with a choice box
|
2020-07-17 17:10:14 -07:00 |
|
|
silicons
|
8caf063765
|
Merge pull request #12757 from Owai-Seek/better-snack-comments
Updates some comments.
|
2020-07-17 17:09:50 -07:00 |
|
|
silicons
|
93d669d205
|
Merge pull request #12759 from YakumoChen/hierophant-hugbox
set hierophant friendly fire check to on by default
|
2020-07-17 17:09:17 -07:00 |
|
|
silicons
|
655afda020
|
Merge pull request #12780 from BlackMajor/borgo
Even more engiborg power creep
|
2020-07-17 17:08:23 -07:00 |
|
|
silicons
|
3d5c77f62b
|
Merge pull request #12779 from b1tt3r1n0/circlegame
Circle Game, Updated
|
2020-07-17 17:08:06 -07:00 |
|
|
silicons
|
04df84d1e0
|
Merge pull request #12776 from timothyteakettle/snail-shells
snail shell backpack
|
2020-07-17 17:07:46 -07:00 |
|
|
silicons
|
183a929e42
|
Merge pull request #12775 from timothyteakettle/wrestling-rotation-fix
wrestling rotation fix
|
2020-07-17 17:07:06 -07:00 |
|
|
Winter Flare
|
61f4fbc67a
|
Merge branch 'master' into foodport-p2-7/12/20
|
2020-07-17 19:27:50 -04:00 |
|
|
Timothy Teakettle
|
93b4570f8d
|
more changes
|
2020-07-17 23:23:47 +01:00 |
|
|
Timothy Teakettle
|
0bc16c7a37
|
Merge branch 'wound-port' of https://github.com/timothyteakettle/Citadel-Station-13 into wound-port
|
2020-07-17 22:39:03 +01:00 |
|
|
Timothy Teakettle
|
a4478b0cda
|
it continues
|
2020-07-17 22:38:28 +01:00 |
|
|
silicons
|
f1abe0651b
|
Update gas_mixture.dm
|
2020-07-17 12:54:48 -07:00 |
|