Putnam3145
|
3633c6936d
|
Merge pull request #10052 from Ghommie/Ghommie-cit428
Banishes some "me" emote magic numbers from this realm.
|
2019-12-05 20:47:39 -08:00 |
|
kevinz000
|
b932841adf
|
Merge pull request #9975 from Ghommie/Ghommie-cit404
Merging, tweaking or otherwise removing a few of the stupidest cargo packs.
|
2019-12-05 21:47:29 -07:00 |
|
Putnam3145
|
62c0d59102
|
Merge pull request #10008 from Seris02/sleepingcarphallucination
adds sleeping carp wrist wrench/violent grab hallucination
|
2019-12-05 20:46:26 -08:00 |
|
kevinz000
|
176bde7829
|
Merge pull request #9990 from Linzolle/strange-reagent
Fixes to strange reagent and very slight nerf I guess.
|
2019-12-05 21:45:09 -07:00 |
|
kevinz000
|
5048995a58
|
Merge pull request #9993 from Ghommie/Ghommie-cit412
Ports tgstation loom changes, and durathred golems.
|
2019-12-05 21:44:25 -07:00 |
|
kevinz000
|
e2f9a68c2c
|
Merge pull request #10049 from Useroth/new-tg-plants
Colored fairy grass, because fuck your eyes.
|
2019-12-05 21:43:24 -07:00 |
|
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 |
|
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
|
70d305611c
|
Merge pull request #10042 from Ghommie/Ghommie-cit422
fixes sofa overlays doing nothing, because their layer wasn't properly set.
|
2019-12-05 21:28:24 -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
|
7958cfa548
|
Right file
|
2019-12-06 00:27: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 |
|
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 |
|
Useroth
|
b9ce4a8622
|
Oopsie
|
2019-12-05 01:49:55 +01:00 |
|
Useroth
|
950b884da5
|
Adds colored fairygrass.
|
2019-12-05 01:47:42 +01:00 |
|
Trilbyspaceclone
|
73891a02bc
|
messenger
|
2019-12-04 16:56:27 -05:00 |
|
Ghommie
|
3d7ef827a9
|
better.
|
2019-12-04 06:31:48 +01:00 |
|
Ghommie
|
dc91114e8b
|
fixes sofa overlays doing jackshit, because their layer wasn't properly set.
|
2019-12-04 06:26:11 +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
|
d578bbd10a
|
Merge pull request #10021 from Putnam3145/rld-fix
Makes glowsticks no longer radioactively contaminable.
|
2019-12-03 19:53:18 -07: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 |
|
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
|
b501321362
|
Merge pull request #9941 from Putnam3145/personal-closet-fix
Personal closets can use PDAs/tablets now
|
2019-12-03 01:38:42 +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 |
|
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 |
|
Lin
|
99e9c7299e
|
Merge pull request #10004 from Ghommie/Ghommie-cit414
Unmodularizing first aid kits.
|
2019-12-03 01:30:51 +00:00 |
|
Ghommie
|
5669c77d48
|
Bad
|
2019-12-02 19:21:01 +01:00 |
|
Ghommie
|
30b67afed9
|
holodeck machineries and structures have nodeconstruct_1, which means they won't call on_deconstruct anyway.
|
2019-12-02 19:18:36 +01:00 |
|
Ghommie
|
cd3952cb9e
|
Fixes holodeck sleepers leaving sleeper buffers behind when deleted.
|
2019-12-02 19:08:21 +01:00 |
|
Putnam3145
|
8d09f5a082
|
Merge branch 'master' into tinytweaks
|
2019-12-01 23:24:56 -08:00 |
|
Putnam3145
|
8da17c5aaf
|
Merge pull request #9946 from Citadel-Station-13/kevinz000-patch-117
Removes hyperspeed from light pink stabilized for -4.5 stam/tick + free sprint
|
2019-12-01 23:12:35 -08:00 |
|
Putnam3145
|
af31fe12c7
|
Merge pull request #9976 from Ghommie/Ghommie-cit405
Ports "Fixes transit tube barricade spam"
|
2019-12-01 23:07:53 -08:00 |
|
Putnam3145
|
7bb2b042ee
|
Merge pull request #9989 from Ghommie/Ghommie-cit410
Ports the energy gun empty state overlay fix.
|
2019-12-01 23:06:40 -08:00 |
|
Putnam3145
|
4942002698
|
Merge pull request #10022 from Sishen1542/n
techfabs are now easier to investigate
|
2019-12-01 13:44:00 -08:00 |
|