Commit Graph

5185 Commits

Author SHA1 Message Date
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
Putnam
3b25f3e199 Started expanding auxgm a bit 2021-06-10 04:40:23 -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
silicons
09d61c3bec Merge pull request #14776 from WanderingFox95/WanderingFox95-CatSurgeon
New Challenger: The Cat Surgeon has appeared! (Ready!)
2021-06-09 11:29:24 -07:00
silicons
eb4b4088f4 Merge pull request #14760 from keronshb/floorcluwneport
Ports Floor Cluwnes and Cluwnes.
2021-06-09 11:21:22 -07:00
silicons
c0e3b8d5ef Merge pull request #14809 from SandPoot/speak-nice-yes
Centralizes borg speech and uses some of the icons for the typing indicator
2021-06-09 11:15:01 -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
SandPoot
b0940456f5 upload files 2021-06-08 13:13:22 -03:00
keronshb
40f9941849 Fixes invisibility when being dragged and glass table cheese 2021-06-04 22:52:03 -04: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
keronshb
70926f5daf Merge remote-tracking branch 'upstream/master' into floorcluwneport 2021-05-31 22:21:34 -04:00
WanderingFox95
df0e1057d1 Imagine this crazy person became a threat suddenly 2021-05-30 21:15:44 +02:00
keronshb
7dbab19597 Fixes the linters and adds a proper async 2021-05-27 00:14:43 -04:00
keronshb
78db6bd5c2 Ports Floor Cluwnes
Oh fuck oh god
2021-05-26 21:58:35 -04: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
silicons
e1a800ff49 Merge pull request #14742 from keronshb/specialhudport
(READY) Ports Special Hud icons for some simple mobs
2021-05-22 01:37:59 -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
keronshb
a6e157ba73 IT WORKS!! 2021-05-19 19:03:21 -04: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
keronshb
60965939d6 bigger mobs have some special health bars (#49104)
* cool beans

* more, more!

* smol fix
2021-05-19 11:59:50 -04:00
Putnam
030361e1cc suggestions 2021-05-18 16:18:57 -07:00
qweq12yt
ba20b5b8aa fix emag shuttle order 2021-05-17 18:48:01 -03: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
5601badbff deterministic explosion system (#13392)
* wae explosions

* okay

* changes

* fixes

* fix

* ok

* ok

* kills more dead code

* okay

* fix

* ok

* tiles

* ok

* okay

* woops

* ok

* fix

* okay

* mob damage

* fixes

* insanity

* more

* more

* fixes

* more

* woot

* don't commit that

* YES

* fix
2021-05-12 05:44:53 -05:00
silicons
2d455e4da2 Merge pull request #14710 from Linzolle/anthro
Anthromorphic isnt a word
2021-05-12 04:42:28 -06:00
silicons
c5f13c44a8 Merge pull request #14708 from qweq12yt/misc-fixes
[Fix] Bugs are BAD!
2021-05-12 04:42:22 -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
Lin
19d6ff8371 Merge pull request #14703 from LetterN/fixes-syndie-shit
balances syndie simplemob
2021-05-10 14:29: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
LetterN
2bf221be4f fixes syndie simplemob 2021-05-09 21:35:15 +08:00
silicons
633591b81e Merge pull request #14688 from SandPoot/good-tooltips
Makes tooltips good and creates a base for adding more.
2021-05-07 18:41:22 -06:00
Timothy Teakettle
5bc33c222a Merge remote-tracking branch 'upstream/master' into rp-markings-attempt-two 2021-05-08 01:28:23 +01:00
keronshb
7947258e51 Off balance disarm
If it hits a wall or a person while under the effect of off balance.
2021-05-05 23:57:01 -04:00
SandPoot
9cf04467a7 upload files 2021-05-05 17:55:30 -03:00
Timothy Teakettle
ba71bb944a im not crazy but this commit breaks 90% of the game 2021-05-05 18:11:05 +01:00
keronshb
be2e962983 Off Balance for Guns only again
Was intended for guns
2021-05-04 00:51:16 -04:00
Timothy Teakettle
93254f5d9c Merge remote-tracking branch 'upstream/master' into rp-markings-attempt-two 2021-05-02 22:20:57 +01:00
Timothy Teakettle
ac504d679b digi humans 2021-04-30 14:07:44 +01:00