Artur
|
de5e87d522
|
Fixes a typo
|
2020-07-19 02:37:11 +03:00 |
|
Winter Flare
|
2effbf4db0
|
Fixes Spiral, and Cracker Box
|
2020-07-18 18:53:47 -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 |
|
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
|
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 |
|
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 |
|
kappa-sama
|
0364fe8579
|
lower cost
|
2020-07-18 03:50:17 -04:00 |
|
lolman360
|
55ed77a89d
|
Update robot_modules.dm
|
2020-07-18 16:15:47 +10:00 |
|
lolman360
|
f84b044f34
|
Update robot_modules.dm
|
2020-07-18 16:05:57 +10: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 |
|
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
|
c924290cd1
|
Merge pull request #12733 from TheObserver-sys/Finally,moreblorble
Slime Extractification
|
2020-07-17 17:10:32 -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
|
04df84d1e0
|
Merge pull request #12776 from timothyteakettle/snail-shells
snail shell backpack
|
2020-07-17 17:07:46 -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
|
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 |
|
kappa-sama
|
6cd9993e50
|
5
|
2020-07-17 15:54:45 -04:00 |
|
silicons
|
329ba4d823
|
Update gas_mixture.dm
|
2020-07-17 12:53:43 -07:00 |
|
silicons
|
a2c3643e20
|
fix
|
2020-07-17 12:46:32 -07:00 |
|
Lin
|
76c6c767d9
|
Merge pull request #12784 from silicons/shields
fixes active block toggle not existing
|
2020-07-17 14:43:40 -05:00 |
|
silicons
|
cc6079d413
|
Update human_movement.dm
|
2020-07-17 09:10:03 -07:00 |
|
silicons
|
993b4ec222
|
Merge remote-tracking branch 'citadel/master' into unarmed_parry
|
2020-07-16 19:39:46 -07:00 |
|
silicons
|
484da28600
|
Merge branch 'master' into shoelaces
|
2020-07-16 17:31:41 -07:00 |
|
silicons
|
e03948dcba
|
Merge pull request #12229 from Arturlang/TGUI-3.0
[READY]TGUI 3.0
|
2020-07-16 17:28:42 -07:00 |
|
DeltaFire
|
9e05d9f748
|
fixes swarmers not being able to eat any items
|
2020-07-16 23:26:46 +02:00 |
|
Timothy Teakettle
|
ebd648c03d
|
name edgecase too
|
2020-07-16 18:32:24 +01:00 |
|
Timothy Teakettle
|
a8a495c0ac
|
rewrites pickle handling
|
2020-07-16 18:22:58 +01:00 |
|
Artur
|
9e73788714
|
Gah
|
2020-07-16 17:40:05 +03:00 |
|
BlackMajor
|
fc909cd7c6
|
Added material sheets and tiles. This took more work than you'd think.
|
2020-07-17 01:17:54 +12:00 |
|
Arturlang
|
92ed5d3201
|
Merge branch 'master' into TGUI-3.0
|
2020-07-16 15:59:37 +03:00 |
|
Artur
|
af65b626e3
|
Merge remote-tracking branch 'Upstream/master' into TGUI-3.0
|
2020-07-16 15:56:08 +03:00 |
|
Letter N
|
7eab0263ba
|
https://github.com/tgstation/tgstation/pull/51213
|
2020-07-16 20:51:25 +08:00 |
|
Letter N
|
819ca63456
|
https://github.com/tgstation/tgstation/pull/51679 - pickup_item missing
|
2020-07-16 20:42:02 +08:00 |
|
Letter N
|
abd0ac089d
|
https://github.com/tgstation/tgstation/pull/51687
|
2020-07-16 20:36:08 +08:00 |
|