 kevinz000
|
b5595114c1
|
Merge pull request #9805 from Ghommie/Ghommie-cit352
Uplink items are now automatically sorted alphabetically.
|
2019-12-05 21:40:09 -07:00 |
|
|
Ghommie
|
4ceb0a25d0
|
undefined var.
|
2019-12-06 05:38:03 +01:00 |
|
|
kevinz000
|
d217a9f445
|
Merge pull request #10032 from Ghommie/Ghommie-cit418
Porting some return type annotations and bad keyword fixes.
|
2019-12-05 21:33:12 -07:00 |
|
|
kevinz000
|
bd1b79b182
|
Merge pull request #10041 from kappa-sama/patch-8
[SALT] chargers and chaos stands are now reasonable to fight
|
2019-12-05 21:29:39 -07:00 |
|
|
kevinz000
|
2fcdb24fe3
|
Merge pull request #10019 from Seris02/wintercoattide
Adds CentCom, Assistant's formal, ratvarian and narsian winter coats + loadout for formal
|
2019-12-05 21:29:08 -07:00 |
|
|
kevinz000
|
bbd482015c
|
Merge pull request #10033 from Ghommie/Ghommie-cit419
Fixes traitor codewords highlight and some other hear signal hooks.
|
2019-12-05 21:28:03 -07:00 |
|
|
kevinz000
|
29497320c1
|
Merge pull request #10025 from Linzolle/butchering
refactor butchering component
|
2019-12-05 21:19:57 -07:00 |
|
|
Ghommie
|
d6fe78f4a7
|
fixes on_mob eyes overlays not updating properly sometimes.
|
2019-12-06 03:38:39 +01:00 |
|
|
Ghommie
|
5024e900f7
|
Ooow fuck.
|
2019-12-06 02:45:55 +01:00 |
|
|
Ghommie
|
f1ccccbf36
|
drake.
|
2019-12-06 02:14:15 +01:00 |
|
|
Ghommie
|
9ca7bb759c
|
Ports "Slightly improves visible and audible messages."
|
2019-12-06 02:02:12 +01:00 |
|
|
kappa-sama
|
c1c2661b8c
|
consistency
|
2019-12-05 19:54:58 -05:00 |
|
|
kappa-sama
|
994411cc4e
|
metal
|
2019-12-05 19:49:48 -05:00 |
|
|
kappa-sama
|
d78df2cc5d
|
since they're gone from autos
|
2019-12-05 19:47:54 -05:00 |
|
|
Ghommie
|
238655d599
|
Fixes eyes blindness a little.
|
2019-12-06 00:10:50 +01:00 |
|
|
BlackMajor
|
b7d0cc6516
|
Merge pull request #9884 from Useroth/blackpowder-alternative
Black powder fix. Alternative to #9861
|
2019-12-06 11:32:17 +13:00 |
|
|
BlackMajor
|
a6f48ea74c
|
Merge pull request #9372 from Weblure/Xenobio-Hotkeys
[Ready] [Test Merge] Ports Xenobio Hotkeys
|
2019-12-06 11:29:34 +13:00 |
|
|
Ghommie
|
53ff425f04
|
Banishes some magic numbers from this realm.
|
2019-12-05 21:55:28 +01:00 |
|
|
Useroth
|
f4bffdc56d
|
To make sure it doesn't runtime
|
2019-12-05 19:05:57 +01:00 |
|
|
Useroth
|
2e84c30e59
|
Tiny touch-ups
|
2019-12-05 16:29:50 +01:00 |
|
|
Artur
|
82d1497ddc
|
Fixes bad buds and toxin healing
|
2019-12-05 17:29:00 +02:00 |
|
|
kappa-sama
|
676476726f
|
i forgot to actually add the bullet
|
2019-12-05 09:50:34 -05:00 |
|
|
kappa-sama
|
df0fa330bf
|
bullet
|
2019-12-05 09:49:09 -05:00 |
|
|
kappa-sama
|
329e07b037
|
357 bullets and rifle clips
|
2019-12-05 09:46:13 -05:00 |
|
|
Seris02
|
0c5a1b900b
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into wintercoattide
|
2019-12-05 21:09:38 +08:00 |
|
|
Seris02
|
2ce79828b8
|
ratvar coat updated
|
2019-12-05 20:46:59 +08:00 |
|
|
kappa-sama
|
7d77159748
|
5->20
|
2019-12-04 21:04:47 -05:00 |
|
|
Useroth
|
950b884da5
|
Adds colored fairygrass.
|
2019-12-05 01:47:42 +01:00 |
|
|
TrilbySpaceClone
|
e1717bb534
|
Merge branch 'master' into crow
|
2019-12-03 23:45:05 -05:00 |
|
|
kappa-sama
|
525d36cc6b
|
chaos
|
2019-12-03 23:18:45 -05:00 |
|
|
kappa-sama
|
af0cbc460b
|
charger
|
2019-12-03 23:18:03 -05:00 |
|
|
kevinz000
|
6e7bceb993
|
Merge pull request #10039 from Putnam3145/traitor-fix
makes traitor antag datum and descendents removable by admins
|
2019-12-03 19:15:19 -07:00 |
|
|
Putnam
|
4e2c72f2ed
|
makes traitor removable
|
2019-12-03 16:58:32 -08:00 |
|
|
Ghommie
|
91ffa11bc9
|
Nerfs circuit pneumatic cannons and guns with extra sanity checks.
|
2019-12-04 01:07:36 +01:00 |
|
|
Ghommie
|
71a5d12c44
|
Don't run away Assembly!! I'll end you!!
|
2019-12-03 23:08:11 +01:00 |
|
|
Artur
|
af4eaf7f0f
|
Fixeesss
|
2019-12-03 23:09:11 +02:00 |
|
|
Seris02
|
72e5e17c51
|
ratvarian and narsian winter coats
|
2019-12-03 18:16:36 +08:00 |
|
|
Ghommie
|
428234c0d6
|
Dilemma.
|
2019-12-03 06:53:46 +01:00 |
|
|
Ghommie
|
fa270c8a79
|
leftovers.
|
2019-12-03 06:48:25 +01:00 |
|
|
Ghommie
|
6e318bfb09
|
Fixes traitor codewords highlight and some other hear signal hoonks.
|
2019-12-03 06:31:35 +01:00 |
|
|
Ghommie
|
fdea134d64
|
dum
|
2019-12-03 04:30:46 +01:00 |
|
|
Ghommie
|
3c7d2972de
|
Porting some return type annotations and bad keyword fixes, linter stuff.
|
2019-12-03 03:31:35 +01:00 |
|
|
Lin
|
100e1e0507
|
why didn't I do this earlier
|
2019-12-03 01:40:37 +00:00 |
|
|
Lin
|
a33dba803e
|
Merge pull request #9992 from Ghommie/Ghommie-cit411
Fixes ai displays status being reset to "Neutral" on login, regardless of choice.
|
2019-12-03 01:36:02 +00:00 |
|
|
Ghommie
|
9b62a5ad01
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit394
|
2019-12-03 02:33:32 +01:00 |
|
|
Ghommie
|
8615c0ea8f
|
Merge branch 'Ghommie-cit394' of https://github.com/Ghommie/Citadel-Station-13 into Ghommie-cit394
|
2019-12-03 02:32:59 +01:00 |
|
|
Lin
|
00acb5749f
|
Merge pull request #9988 from Ghommie/Ghommie-cit409
Fixes ED-209 being unbuildable past the welding step.
|
2019-12-03 01:31:40 +00:00 |
|
|
Winter Flare
|
c31ca96e87
|
Rebalanced Meat Crate
|
2019-12-02 16:21:48 -05:00 |
|
|
Artur
|
90113838a7
|
Iconfix and co
Traits instead of procs for fakedeath
Quickfix
Whoops this too
Loadsa fixes
Nerfs stamina regen
Too slow
Hm
|
2019-12-02 19:48:02 +02:00 |
|
|
Putnam3145
|
8d09f5a082
|
Merge branch 'master' into tinytweaks
|
2019-12-01 23:24:56 -08:00 |
|