17d1fd0692
fixes
2020-07-22 12:42:46 +10:00
3ed854bdb3
Update gun.dm
2020-07-21 19:38:38 -07:00
3a83c526b6
Update gun.dm
2020-07-21 19:36:37 -07:00
49941ea2e6
code, still not enabled
2020-07-22 10:27:37 +08:00
744b6d6b48
Merge pull request #12851 from zeroisthebiggay/fetishcontentfetishcontent
...
maid fetish content pr
2020-07-21 19:20:52 -07:00
c07e5d544b
wweeee
2020-07-22 11:27:26 +10:00
2968963f19
Allows Photos to be Burned
2020-07-21 20:20:51 -05:00
0f1aa3c0ca
'lolman? did you test your code?'
...
no i did not ms. kevinz
2020-07-22 10:49:56 +10:00
6a4264085c
woops 2: electric boogaloo
2020-07-22 00:17:03 +01:00
0706ac9d2a
woops
2020-07-22 00:14:26 +01:00
6891bff9d3
further emotes
2020-07-22 00:07:15 +01:00
3a520bba3f
more hats
2020-07-21 23:45:04 +01:00
5c88253f93
lots more hats
2020-07-21 22:58:13 +01:00
286e5384d1
fix
2020-07-21 12:07:24 -07:00
2f11fb6a8b
ok
2020-07-21 11:59:39 -07:00
9a5e53a21f
ok
2020-07-21 11:57:47 -07:00
184e3992f3
fixes
2020-07-21 11:56:23 -07:00
aea268548c
some fixes
2020-07-21 19:54:42 +01:00
4d48abf3a6
fixes
2020-07-21 11:46:17 -07:00
f3efa19436
Merge remote-tracking branch 'citadel/master' into 12742
2020-07-21 11:25:26 -07:00
0942b46796
more fashions
2020-07-21 18:43:58 +01:00
8e2c76db7c
two more
2020-07-21 16:42:59 +01:00
99a2068dd2
its cool and hip
2020-07-21 16:26:51 +01:00
7b35c5fd9d
a
2020-07-21 02:30:32 -04:00
fb35248e3b
a
2020-07-21 02:24:22 -04:00
1450b11b01
sigh
2020-07-20 21:37:44 -07:00
87d53957bf
sigh
2020-07-20 20:09:13 -07:00
4daf71d99e
woo it works
2020-07-21 03:34:50 +01:00
4832069181
Update preferences_savefile.dm
2020-07-20 18:57:09 -07:00
47ff13c539
apply the overlay
2020-07-21 02:37:21 +01:00
1ed035e4a3
move
2020-07-21 02:29:41 +01:00
3e0403a7e9
BEEPSKY FASHION
2020-07-21 02:22:42 +01:00
c92abfe2ce
bruh
2020-07-20 21:18:39 -04:00
6e08865b36
Update topic.dm
2020-07-20 17:30:35 -07:00
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
75a2035774
Merge branch 'master' into wound-port
2020-07-21 01:10:51 +01:00
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
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
a7144d2404
Merge pull request #12829 from timothyteakettle/fried-component
...
the fried component
2020-07-20 16:59:36 -07:00
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
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
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
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
fefc0530b8
Merge pull request #12795 from TheSpaghetti/patch-3
...
Makes extradimensional oranges weirder. [/TG/ PORT]
2020-07-20 16:54:43 -07:00
4d4133a8da
Merge pull request #12819 from Arturlang/bloodsucker_typo
...
Fixes a bloodsucker lair typo
2020-07-20 16:53:42 -07:00
2ec64f3e05
Update wizard.dm
2020-07-20 16:50:56 -07:00
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
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
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
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
lolman360