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
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
Timothy Teakettle
eab0ae8af0
small changes
2020-07-20 17:20:54 +01:00
silicons
ae83a6df02
fix
2020-07-19 19:51:17 -07:00
timothyteakettle
e2b68797b7
bugfixes
2020-07-20 00:49:00 +01:00
BlackMajor
f265b85d3b
Merge pull request #12810 from lolman360/master
...
service borg fix/tweak
2020-07-20 11:42:59 +12:00
timothyteakettle
8709a72fc0
fry everything
2020-07-20 00:40:18 +01:00
Winter Flare
e416a2377e
Merge branch 'master' into foodport-p2-7/12/20
2020-07-19 18:58:52 -04:00
Winter Flare
1ebb81e44c
Fixes, final tweaks.
2020-07-19 18:52:20 -04:00
kappa-sama
ba15c17e02
here
2020-07-19 15:14:44 -04:00
kappa-sama
26a240ddb9
bye
2020-07-19 15:14:12 -04:00
Timothy Teakettle
1b99cb9201
everything has the bonesetter
2020-07-19 18:32:44 +01:00
Timothy Teakettle
fdfee756b7
you can enter stamcrit now
2020-07-19 18:18:22 +01:00
Timothy Teakettle
ca6b289da6
fix tables and some minor thing
2020-07-19 17:49:22 +01:00
Lin
f2e0e5c247
Merge pull request #12814 from Citadel-Station-13/silicons-patch-35
...
fixes gateways switching to active power use when thy should not be using power at all
2020-07-19 11:10:51 -05:00
Kraseo
7094649881
don't like this
2020-07-19 11:30:55 +02:00
kappa-sama
38f05bf230
6 because i feel like it
2020-07-19 04:37:51 -04:00
kappa-sama
6075af8eb0
nerfies
2020-07-19 04:28:44 -04:00
silicons
a0250cfaaa
Update _movespeed_modifier.dm
2020-07-18 20:42:39 -07:00
silicons
7fc7d5888a
Update _movespeed_modifier.dm
2020-07-18 20:39:05 -07:00
silicons
55f8e37544
sigh
2020-07-18 20:26:11 -07:00
silicons
910869d6bf
more
2020-07-18 19:44:12 -07:00
silicons
20381927e4
Update projectile.dm
2020-07-18 19:18:42 -07:00
Winter Flare
506ddd83fe
Meatloaf, Meatball sub, fixes.
2020-07-18 22:16:19 -04:00
silicons
b1ccccb322
more
2020-07-18 18:51:16 -07:00
silicons
1a040dd2a6
changes
2020-07-18 18:44:17 -07:00
silicons
0c6368e3e7
e
2020-07-18 18:34:16 -07:00
silicons
0b98b0409b
sigh
2020-07-18 18:29:09 -07:00
silicons
7c5d4f863d
click cd breakout
2020-07-18 18:10:21 -07:00
silicons
3d65be4ee9
sigh
2020-07-18 18:03:17 -07:00
Winter Flare
89ecaf3b82
Potato Meals, Sweet and Sour.
2020-07-18 20:53:16 -04:00
silicons
1ba6777b35
Whew
2020-07-18 17:49:06 -07:00
silicons
771a28e685
oh boy
2020-07-18 17:48:51 -07:00