silicons
286e5384d1
fix
2020-07-21 12:07:24 -07:00
silicons
2f11fb6a8b
ok
2020-07-21 11:59:39 -07:00
silicons
9a5e53a21f
ok
2020-07-21 11:57:47 -07:00
silicons
184e3992f3
fixes
2020-07-21 11:56:23 -07:00
Timothy Teakettle
aea268548c
some fixes
2020-07-21 19:54:42 +01:00
silicons
4d48abf3a6
fixes
2020-07-21 11:46:17 -07:00
silicons
f3efa19436
Merge remote-tracking branch 'citadel/master' into 12742
2020-07-21 11:25:26 -07:00
Timothy Teakettle
0942b46796
more fashions
2020-07-21 18:43:58 +01:00
timothyteakettle
8e2c76db7c
two more
2020-07-21 16:42:59 +01:00
timothyteakettle
99a2068dd2
its cool and hip
2020-07-21 16:26:51 +01:00
zerothebigboy
7b35c5fd9d
a
2020-07-21 02:30:32 -04:00
zerothebigboy
fb35248e3b
a
2020-07-21 02:24:22 -04:00
silicons
1450b11b01
sigh
2020-07-20 21:37:44 -07:00
silicons
87d53957bf
sigh
2020-07-20 20:09:13 -07:00
timothyteakettle
4daf71d99e
woo it works
2020-07-21 03:34:50 +01:00
silicons
4832069181
Update preferences_savefile.dm
2020-07-20 18:57:09 -07:00
timothyteakettle
47ff13c539
apply the overlay
2020-07-21 02:37:21 +01:00
timothyteakettle
1ed035e4a3
move
2020-07-21 02:29:41 +01:00
timothyteakettle
3e0403a7e9
BEEPSKY FASHION
2020-07-21 02:22:42 +01:00
kappa-sama
c92abfe2ce
bruh
2020-07-20 21:18:39 -04:00
silicons
6e08865b36
Update topic.dm
2020-07-20 17:30:35 -07:00
silicons
aa3cc9fae8
Merge pull request #12824 from kappa-sama/patch-35
...
makes brainwashing disk role restricted and debuffs its price
2020-07-20 17:25:53 -07:00
Timothy Teakettle
75a2035774
Merge branch 'master' into wound-port
2020-07-21 01:10:51 +01:00
Lin
b6f689b06d
Merge pull request #12843 from Citadel-Station-13/silicons-patch-40
...
uhhhhhhh ok nothing to see here let's fix spell packets this time again
2020-07-20 19:05:28 -05:00
silicons
3d2995b4e8
Merge pull request #12787 from CameronWoof/advanced-sutures-and-mesh
...
Ports Medicated Sutures and Advanced Regenerative Mesh from TG
2020-07-20 17:01:32 -07:00
silicons
a7144d2404
Merge pull request #12829 from timothyteakettle/fried-component
...
the fried component
2020-07-20 16:59:36 -07:00
silicons
7df369e5d7
Merge pull request #12811 from kappa-sama/patch-33
...
removes the 2 best weapons in the game from traitor uplink's 10tc surgery bag
2020-07-20 16:58:01 -07:00
silicons
1d99591b6b
Merge pull request #12807 from kappa-sama/patch-32
...
lowers stray cargo pod weight from 2x normal to 1/2 normal
2020-07-20 16:57:24 -07:00
silicons
3f2cab02eb
Merge pull request #12826 from Kraseo/instastuns-bad
...
Makes damp rags no longer instantly apply chemicals
2020-07-20 16:56:22 -07:00
silicons
c7022445b5
Merge pull request #12800 from DeltaFire15/swarmer-fix
...
Fixes swarmers not being able to eat any items at all
2020-07-20 16:55:00 -07:00
silicons
fefc0530b8
Merge pull request #12795 from TheSpaghetti/patch-3
...
Makes extradimensional oranges weirder. [/TG/ PORT]
2020-07-20 16:54:43 -07:00
silicons
4d4133a8da
Merge pull request #12819 from Arturlang/bloodsucker_typo
...
Fixes a bloodsucker lair typo
2020-07-20 16:53:42 -07:00
silicons
2ec64f3e05
Update wizard.dm
2020-07-20 16:50:56 -07:00
Lin
f0df3689dc
Merge pull request #12790 from Citadel-Station-13/silicons-patch-30
...
truncates sdql2 output to 2500 objects instead of 20000 because it's a real epic gamer moment when admins crash their clients doing SELECT /datum/gas_mixture
2020-07-20 18:20:27 -05:00
Lin
67a6330e77
Merge pull request #12786 from silicons/survivalists
...
makes survivalists pseudoantags again and limits summon guns/magic to one use
2020-07-20 18:20:08 -05:00
Lin
f7355dde62
Merge pull request #12728 from silicons/vote
...
"I didn't see the map vote" - Adds a stat vote panel for plurality and approval voting as an alternative to the regular popups.
2020-07-20 18:17:45 -05:00
silicons
267186a5d3
Merge pull request #12646 from Chiirno/emi
...
[READY] Alt-click cigarette pack functionality added to pill bottles.
2020-07-20 16:15:38 -07:00
silicons
5c189b310e
ok, snaxi
2020-07-20 15:43:48 -07:00
Keate Senior
ecb9a430eb
Stable gateways and integration cog QoL by DeltaFire
...
APC interfaces now lock after being cogged, and Reebe can only be accessed by stabilizing/linking an obelisk with the one in reebe
2020-07-20 16:57:23 -04:00
silicons
692656b02d
Whew
2020-07-20 11:53:33 -07:00
kappa-sama
3676b03f28
experiment
2020-07-20 14:53:22 -04:00
silicons
526d257410
fix
2020-07-20 11:48:08 -07:00
Timothy Teakettle
4b70e29e36
let the fry smite work
2020-07-20 19:42:07 +01:00
silicons
416b989e12
changes
2020-07-20 11:35:10 -07:00
silicons
98d3ac80d9
:pika:
2020-07-20 11:25:17 -07:00
silicons
d43a5cae26
let's refactor attack_hand.
2020-07-20 11:19:20 -07:00
silicons
984796b8c6
sigh
2020-07-20 10:46:52 -07:00
silicons
58e26c540c
merge from master
2020-07-20 10:18:44 -07:00
silicons
6ab250dd03
sigh
2020-07-20 10:13:50 -07:00
Timothy Teakettle
b06948bed4
fry smite
2020-07-20 17:48:37 +01:00
