BlueWildrose
0735ec66b3
Fixes brainless sprite being an error sprite
2021-08-01 06:33:08 -07:00
Putnam3145
95d2adb996
a bunch of async and waitfor
2021-07-25 19:51:27 -07:00
Putnam3145
cd2a710a23
there's too many errors caused by these two
2021-07-25 19:36:23 -07:00
silicons
3070f178e0
Merge remote-tracking branch 'citadel/master' into combat_patches_1
2021-07-18 15:12:52 -07:00
silicons
7cd89978f2
Merge pull request #14933 from keronshb/stripdcport
...
[PORT] Stripping a disconnected player will tell them when they come back (+Lazynull)
2021-07-18 15:05:48 -07:00
Lin
d50eb91632
Merge pull request #14921 from Putnam3145/componentize-acid
...
Componentizes acid
2021-07-13 11:52:43 -07:00
Lin
daf837f89e
Merge pull request #14924 from Citadel-Station-13/restraints
...
handcuffs now require you to stand still to break out of again. Buffs bolas and energy snares breakout time because I forgot to do that when I made you able to move while breaking out of it
2021-07-12 00:03:39 -07:00
Lin
3b1bef2729
Merge pull request #14922 from Putnam3145/remove-dirt-buildup
...
Removes causes_dirt_buildup_on_floor and replaces it with just making humans do that in their Move
2021-07-11 10:27:31 -07:00
Putnam3145
70a5dd3693
yes
2021-07-10 22:53:14 -07:00
keronshb
c7d1c9d8e8
Ports Stripping log when dc'd
2021-07-07 21:12:44 -04:00
DeltaFire
dd71d12359
aaaaaaaaa
2021-07-05 15:28:39 +02:00
silicons
18fb23bb1f
Update carbon.dm
2021-07-04 18:19:31 -07:00
silicons
1620aa46da
Update carbon.dm
2021-07-04 10:55:02 -07:00
Putnam3145
21c77d25a2
yeah yeah sure whatever
2021-07-03 22:40:09 -07:00
Putnam3145
2be56ab992
Removes causes_dirt_buildup_on_floor
2021-07-03 22:19:05 -07:00
Putnam3145
899e74fc83
Componentized acid
2021-07-03 22:10:44 -07:00
silicons
a73ca4be46
scope creep lmao
2021-06-28 12:29:18 -07:00
Lin
0bfb671f4e
Merge pull request #14482 from silicons/combat_v7
...
Combat v7 - Sprint removal, automatic block/parry, turns combat mode into a pure UI/interaction toggle with no side effects, and a truckload of other stuff.
2021-06-27 13:04:29 -07:00
silicons
5204f5a6d9
Merge pull request #13991 from Putnam3145/auxtools-atmos
...
Replaces extools with auxtools; atmos overhaul
2021-06-27 11:01:32 -07:00
silicons
08f251a88c
Merge remote-tracking branch 'citadel/master' into combat_v7
2021-06-27 10:44:51 -07:00
DeltaFire
c7a098da06
suffering (aka, a bunch of fixes)
2021-06-21 19:05:31 +02:00
Putnam3145
f77495f45d
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos
2021-06-21 02:19:51 -07:00
Artur
5619b73e6b
Makes it actually, actually work
2021-06-16 02:02:28 +03:00
Artur
724b34f55d
https://github.com/tgstation/tgstation/pull/54710
2021-06-16 00:44:32 +03:00
silicons
8595e05ad9
Merge remote-tracking branch 'citadel/master' into combat_v7
2021-06-13 15:37:35 -07:00
Putnam
a9db30d6d9
optimization, fix to breath, experimenting with speed
2021-06-13 07:31:01 -07:00
Putnam
833d34ba8e
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos
2021-06-11 16:28:12 -07:00
Putnam
571a25c052
Finished the first auxgm expansion
2021-06-11 16:15:00 -07:00
Putnam
eda6a4d2e2
Aaaa
2021-06-11 05:23:24 -07:00
silicons
5e4f3ed694
Merge pull request #14683 from keronshb/shovedisarmgun
...
Off Balance Disarms only if shoved into a wall or person.
2021-06-09 12:14:37 -07:00
Putnam
86177c51c4
auxgm part 1
...
see also https://github.com/Baystation12/Baystation12/blob/dev/code/modules/xgm/xgm_gas_data.dm
2021-06-08 09:54:28 -07:00
silicons
40f2c06f2e
Merge remote-tracking branch 'citadel/master' into combat_v7
2021-06-07 16:47:11 -07:00
DeltaFire
b2e2c49011
plasmamen & golems
2021-06-02 17:47:57 +02:00
DeltaFire
0f01a4a7da
huh
2021-06-01 22:52:39 +02:00
DeltaFire
dd33371a3b
colors
2021-06-01 22:48:57 +02:00
silicons
eba3f554bc
Merge pull request #14737 from zeroisthebiggay/KILL
...
Traitor's Bizarre Adventure Episode One: Mauler Gauntlets Are Unbreakable
2021-05-23 08:52:25 -06:00
silicons
92e019dd56
Merge pull request #14716 from Putnam3145/fix-blacklisting-traits
...
Makes species/antag trait blacklist no longer remove ALL traits
2021-05-22 03:41:57 -06:00
Putnam
e580c504fa
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos
2021-05-21 18:52:16 -07:00
Lin
0c77834c56
Merge pull request #14733 from qweq12yt/misc-fixes
...
[Fix] Even More bug fixing
2021-05-19 14:49:00 -05:00
zerothebigboy
bc61ada440
KILL
2021-05-19 13:24:40 -04:00
Putnam
030361e1cc
suggestions
2021-05-18 16:18:57 -07:00
qweq12yt
9dd372ed11
fix void cloak going to the void
2021-05-17 17:33:23 -03:00
timothyteakettle
34869215e8
Merge remote-tracking branch 'upstream/master' into rp-markings-attempt-two
2021-05-14 01:59:32 +01:00
Putnam
1a92973d99
Antag/species quirk blacklist fix
2021-05-12 10:18:52 -07:00
silicons
2d455e4da2
Merge pull request #14710 from Linzolle/anthro
...
Anthromorphic isnt a word
2021-05-12 04:42:28 -06:00
Linzolle
4609d732f9
more spellcheck of anthropomorph
2021-05-10 17:15:43 -05:00
Lin
59914250c3
spellcheck
2021-05-10 17:04:48 -05:00
qweq12yt
8c0911e968
fix hulks breaking cuffs/zipties
2021-05-10 15:56:50 -03:00
Timothy Teakettle
be9b1ddffb
fixes
2021-05-10 14:43:45 +01:00
keronshb
cda492c6ba
Removes the condition if they're knocked down
2021-05-09 20:10:38 -04:00
