timothyteakettle
0ccbe0b793
it works
2020-07-22 14:49:22 +01:00
Timothy Teakettle
aea268548c
some fixes
2020-07-21 19:54:42 +01: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
Timothy Teakettle
4b70e29e36
let the fry smite work
2020-07-20 19:42:07 +01: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
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
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
Artur
de5e87d522
Fixes a typo
2020-07-19 02:37:11 +03:00
Timothy Teakettle
1a5008fee7
Merge branch 'master' into wound-port
2020-07-18 23:06:49 +01:00
Lin
ba3dc6a73b
Merge pull request #12679 from silicons/unarmed_parry
...
Ok ok hear me out: Implements unarmed parry.
2020-07-18 17:02:02 -05:00
Timothy Teakettle
345c5c593d
everyone but slimes can scar basically
2020-07-18 22:31:52 +01:00
Timothy Teakettle
74eadcf9c2
removes a singular full stop
2020-07-18 22:25:42 +01:00
Timothy Teakettle
f290050a78
Merge branch 'wound-port' of https://github.com/timothyteakettle/Citadel-Station-13 into wound-port
2020-07-18 22:02:24 +01:00
Timothy Teakettle
b184cfefc5
imagine allowing wound healing
2020-07-18 22:00:28 +01:00
Timothy Teakettle
974b80a2fd
Merge branch 'master' into wound-port
2020-07-18 21:45:24 +01:00
Timothy Teakettle
fe79c53f04
bugfixes
2020-07-18 21:40:19 +01:00
silicons
56f56d5cbe
Update gateway.dm
2020-07-18 10:24:36 -07:00
Lin
e165524763
Merge pull request #12803 from Citadel-Station-13/silicons-patch-32
...
removes tango dancing
2020-07-18 11:17:42 -05:00
kappa-sama
0364fe8579
lower cost
2020-07-18 03:50:17 -04:00
lolman360
55ed77a89d
Update robot_modules.dm
2020-07-18 16:15:47 +10:00
lolman360
f84b044f34
Update robot_modules.dm
2020-07-18 16:05:57 +10:00
timothyteakettle
74b2764591
sprites and some missed things
2020-07-18 03:08:03 +01:00
timothyteakettle
e8fade4f7f
changes
2020-07-18 02:29:12 +01:00
timothyteakettle
8bb9b11922
Merge branch 'wound-port' of https://github.com/timothyteakettle/Citadel-Station-13 into wound-port
2020-07-18 01:26:41 +01:00
timothyteakettle
7714fcfaba
more changes
2020-07-18 01:26:38 +01:00
CameronWoof
431c52b7e2
Merge remote-tracking branch 'upstream/master' into advanced-sutures-and-mesh
2020-07-17 17:22:43 -07:00
silicons
b98102a824
Merge pull request #12762 from zeroisthebiggay/a
...
drops martial art minpops down to twenty pop
2020-07-17 17:11:02 -07:00
silicons
c924290cd1
Merge pull request #12733 from TheObserver-sys/Finally,moreblorble
...
Slime Extractification
2020-07-17 17:10:32 -07:00
