472fda9504
Merge pull request #14833 from zeroisthebiggay/finallytools
...
TG Resprite Compendium Atomization Project | Episode Eight: The Finale: TG Tools
2021-07-04 10:59:43 -07:00
2fb5355066
Update handcuffs.dm
2021-07-04 10:53:17 -07:00
65f22d7e72
Update handcuffs.dm
2021-07-04 10:52:47 -07:00
a419e6706c
Update handcuffs.dm
2021-07-04 10:51:39 -07:00
8710731b87
tweaks
2021-07-01 20:42:55 -07:00
f3b590f5f0
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into remove-sleeps
2021-06-30 02:19:02 -07:00
a00ed83c5e
Merge pull request #14883 from WanderingFox95/WanderingFox95-plushies
...
[Ready] The plushie PR you didn't know we needed (but we kinda did)
2021-06-29 08:51:24 -07:00
22ad8f2c8c
Merge pull request #14893 from WanderingFox95/WanderingFox95-TheDailyWhiplash
...
[Ready] The Daily Whiplash (Newspaper Baton)
2021-06-29 08:50:48 -07:00
a5a476f457
cyborg shovies
2021-06-28 13:10:40 -07:00
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
5204f5a6d9
Merge pull request #13991 from Putnam3145/auxtools-atmos
...
Replaces extools with auxtools; atmos overhaul
2021-06-27 11:01:32 -07:00
08f251a88c
Merge remote-tracking branch 'citadel/master' into combat_v7
2021-06-27 10:44:51 -07:00
9bd1433bbe
Adds a child item to the telebaton
...
identical stats for the future but different looks.
2021-06-25 11:38:21 +02:00
37fe5f297c
fix double . in fusion scan
2021-06-22 22:38:20 -07:00
e709d5cf0c
More code. Shouldn't break anything.
...
We'll see if it does.
2021-06-22 13:35:37 +02:00
0bf383a90b
does this fix it
2021-06-21 09:18:06 -07:00
98ff06fa1a
the roasted roasted roasted roasted roasted roasted roasted roasted......... ( #14850 )
...
* Update misc.dm
* Update code/game/objects/items/melee/misc.dm
Co-authored-by: Putnam3145 <putnam3145@gmail.com >
* Update misc.dm
Co-authored-by: Putnam3145 <putnam3145@gmail.com >
2021-06-21 17:54:56 +02:00
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
d704fec039
Update stunbaton.dm
2021-06-20 11:08:46 -07:00
54d114ce02
Update stunbaton.dm
2021-06-20 11:06:40 -07:00
fb32aa1248
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum
...
# Conflicts:
# tgstation.dme
2021-06-20 03:29:50 -04:00
dbdc3001ba
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos
2021-06-16 23:33:14 -07:00
01e0fa16fe
it works.
2021-06-14 13:52:48 -07:00
8595e05ad9
Merge remote-tracking branch 'citadel/master' into combat_v7
2021-06-13 15:37:35 -07:00
a64d94a7cc
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into beltsprites
2021-06-13 18:25:35 -04:00
bae89fcaba
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into beltsprites
2021-06-13 18:19:01 -04:00
319e03476b
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into miscsprites
2021-06-13 18:16:08 -04:00
e757f9ea2c
thetwentythirdofmany
2021-06-12 17:41:09 -04:00
e0a311435b
thetwentysecondofmany
2021-06-11 20:53:35 -04:00
3fae79f876
thetwentyfirstofmany
2021-06-11 20:28:25 -04:00
b7eecc315f
theeighteenthofmany
2021-06-11 19:49:43 -04:00
53e95b7356
theseventeenthofmany
2021-06-11 19:48:04 -04:00
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
8a5a5ef6cc
thethirteenthofmany
2021-06-11 19:22:05 -04:00
3b25f3e199
Started expanding auxgm a bit
2021-06-10 04:40:23 -07:00
c6a70b9a4e
Update weaponry.dm
2021-06-09 18:37:11 -04:00
fba4b1966c
painful
2021-06-09 18:30:32 -04:00
190edf57e8
painful
2021-06-09 18:28:21 -04:00
a77aa8bd41
Merge pull request #14766 from Linzolle/cultfix
...
Fix cult area shenanigans, cult can do stuff in maint again.
2021-06-09 11:22:26 -07:00
0ee2892bee
Merge pull request #14807 from Putnam3145/make-sleeper-pref-good
...
makes medihound sleeper toggle do something
2021-06-09 11:17:39 -07:00
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
fcd1ec83cc
removed redundant check
2021-06-08 00:25:31 -07:00
f6e08a8d2a
include a message too
2021-06-08 00:24:54 -07:00
a236357ebe
makes medihound sleeper toggle do something
2021-06-08 00:21:19 -07:00
1a800cc470
modifications
2021-06-07 19:40:16 -07:00
40f2c06f2e
Merge remote-tracking branch 'citadel/master' into combat_v7
2021-06-07 16:47:11 -07:00
d03bf641dd
extreme optimization project to maybe fix game
2021-06-06 21:58:24 -07:00
dd33371a3b
colors
2021-06-01 22:48:57 +02:00
cb52be5dd9
fixes linter warnings ( #14778 )
...
* woo
* woo
2021-05-31 10:19:20 -05:00
0cf7c5070d
parentheses
2021-05-27 19:45:12 -05:00
silicons