Commit Graph

15433 Commits

Author SHA1 Message Date
Letter N
49941ea2e6 code, still not enabled 2020-07-22 10:27:37 +08: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
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
kappa-sama
ba15c17e02 here 2020-07-19 15:14:44 -04:00
kappa-sama
26a240ddb9 bye 2020-07-19 15:14:12 -04: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
Artur
de5e87d522 Fixes a typo 2020-07-19 02:37:11 +03: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
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
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
silicons
8caf063765 Merge pull request #12757 from Owai-Seek/better-snack-comments
Updates some comments.
2020-07-17 17:09:50 -07:00
silicons
93d669d205 Merge pull request #12759 from YakumoChen/hierophant-hugbox
set hierophant friendly fire check to on by default
2020-07-17 17:09:17 -07:00
silicons
655afda020 Merge pull request #12780 from BlackMajor/borgo
Even more engiborg power creep
2020-07-17 17:08:23 -07:00
silicons
04df84d1e0 Merge pull request #12776 from timothyteakettle/snail-shells
snail shell backpack
2020-07-17 17:07:46 -07:00
kappa-sama
6cd9993e50 5 2020-07-17 15:54:45 -04:00
silicons
a2c3643e20 fix 2020-07-17 12:46:32 -07:00
Lin
76c6c767d9 Merge pull request #12784 from silicons/shields
fixes active block toggle not existing
2020-07-17 14:43:40 -05:00
silicons
cc6079d413 Update human_movement.dm 2020-07-17 09:10:03 -07:00
silicons
993b4ec222 Merge remote-tracking branch 'citadel/master' into unarmed_parry 2020-07-16 19:39:46 -07:00
silicons
e03948dcba Merge pull request #12229 from Arturlang/TGUI-3.0
[READY]TGUI 3.0
2020-07-16 17:28:42 -07:00
DeltaFire
9e05d9f748 fixes swarmers not being able to eat any items 2020-07-16 23:26:46 +02:00
Timothy Teakettle
ebd648c03d name edgecase too 2020-07-16 18:32:24 +01:00