silicons
da4e208f94
ok
2020-07-23 10:40:12 -07:00
silicons
db24df58a0
Merge remote-tracking branch 'citadel/master' into clickcd_experimental
2020-07-23 10:36:46 -07:00
silicons
9f66163d4f
Merge pull request #12828 from Owai-Seek/foodport-p2-7/12/20
...
Ports several food sprites/foods from Baystation/Citadel RP
2020-07-23 10:35:30 -07:00
silicons
ec72015f4f
Merge pull request #12809 from BlackMajor/borgo
...
Gripper brained. The medborg can do chemistry now, oh no.
2020-07-23 10:35:16 -07:00
silicons
dad3d38933
Merge pull request #12869 from timothyteakettle/zombies-rework
...
the very much needed zombie buffs
2020-07-23 10:29:43 -07:00
silicons
aeb6688bc7
Merge pull request #12860 from Sneakyrat6/burnablePhoto
...
Allows Photos to be Burned
2020-07-23 10:29:10 -07:00
silicons
ffd44b78ba
Merge remote-tracking branch 'citadel/master' into clickcd_experimental
2020-07-23 10:26:03 -07:00
silicons
9222933d77
Merge pull request #12816 from timothyteakettle/wound-port
...
ports part 1 of tg wounds
2020-07-23 10:25:25 -07:00
silicons
4373e2b452
done
2020-07-23 10:18:10 -07:00
silicons
89a1fa544e
fixes
2020-07-23 10:12:34 -07:00
Timothy Teakettle
f5ac0b5762
some fixes
2020-07-23 18:10:46 +01:00
silicons
2eb6f0467d
fix guns
2020-07-23 09:56:38 -07:00
silicons
38a9e89687
ok bet
2020-07-23 09:49:56 -07:00
silicons
0858af4b85
ok
2020-07-23 09:43:43 -07:00
silicons
99eb77c052
fix
2020-07-23 09:32:28 -07:00
silicons
703afec454
ok
2020-07-23 08:57:15 -07:00
silicons
21d57eeeac
sigh
2020-07-23 00:27:45 -07:00
silicons
3a38344a04
fix
2020-07-23 00:25:06 -07:00
silicons
910290edcf
buffers
2020-07-23 00:22:33 -07:00
silicons
76f885e1a6
ok
2020-07-23 00:16:43 -07:00
timothyteakettle
a5945d3dc2
slight zombie tweaking
2020-07-23 01:09:09 +01:00
timothyteakettle
0ccbe0b793
it works
2020-07-22 14:49:22 +01:00
silicons
60a25981bc
Merge pull request #12835 from kappa-sama/patch-36
...
might fix necropolis chests turning up completely empty
2020-07-22 02:31:21 -07:00
silicons
744b6d6b48
Merge pull request #12851 from zeroisthebiggay/fetishcontentfetishcontent
...
maid fetish content pr
2020-07-21 19:20:52 -07:00
Sneakyrat6
2968963f19
Allows Photos to be Burned
2020-07-21 20:20:51 -05:00
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
zerothebigboy
7b35c5fd9d
a
2020-07-21 02:30:32 -04:00
zerothebigboy
fb35248e3b
a
2020-07-21 02:24:22 -04:00
kappa-sama
c92abfe2ce
bruh
2020-07-20 21:18:39 -04: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
