a00fc47d1e
Update parallax.dm ( #37868 )
...
removes the parallelx runtimes
2018-05-17 10:17:26 -05:00
085066d555
Client topics only check for deleted objects when an object was actually passed ( #37866 )
2018-05-17 10:15:12 -05:00
7429a7ef6a
Merge pull request #37839 from AnturK/rr1
...
Fixes minor cleanbot runtime.
2018-05-16 14:37:03 -05:00
aa7a27420c
Merge pull request #37863 from AnturK/rr4
...
Fixes changeling team objectives (a bit)
2018-05-16 14:35:49 -05:00
48c37df7cd
[s] Fixes bioware surgery exploit ( #37860 )
...
* Fixes bioware surgery
* my ass must blast
2018-05-16 14:34:36 -05:00
0333a50552
[Ready] Syndie air alarm/APC subtypes, cleaning up syndie lavaland piping
2018-05-16 12:18:36 -05:00
8efc7711a7
Merge branch 'master' into upstream-merge-37423
2018-05-16 12:17:57 -05:00
b111088140
Fixes meteors hitting qdeleted stuff. ( #37840 )
...
* Fixes meteors hitting qdeleted stuff.
* I made a typo in one line change, time to die.
* Better solution ?
2018-05-16 12:06:06 -05:00
eb29d86c5f
Fixes wrong circuits ( #37853 )
...
* Fixes wrong circuits
* this too
2018-05-16 12:04:54 -05:00
593919a85a
Fixes fireaxe butchering. ( #37850 )
2018-05-16 12:04:45 -05:00
4d3ead744a
Update wallets.dm
2018-05-16 12:15:29 -04:00
ca36def4e6
Merge pull request #6754 from Citadel-Station-13/upstream-merge-37823
...
[MIRROR] Makes cult items less of a vomit coaster
2018-05-16 16:09:21 +00:00
3103119f6b
Update soulstone.dm
2018-05-16 09:04:51 -05:00
fe93e1ccbd
Update cult_items.dm
2018-05-16 09:04:39 -05:00
5e48fcd275
Merge pull request #37846 from DaxDupont/axe-time
...
Small cult nerf do not be alarmed robustin think about your heart
2018-05-16 04:46:59 -05:00
79b5e412f1
Makes cult items less of a vomit coaster
2018-05-15 12:18:00 -05:00
08fab3adaa
Update client_procs.dm
2018-05-15 10:25:58 -05:00
24b6ee5a6c
should make life simpler
2018-05-15 10:05:56 -05:00
173d4fadae
Update subsystems.dm
2018-05-15 09:06:36 -05:00
d421ad846a
Merge pull request #6751 from Citadel-Station-13/upstream-merge-37715
...
[MIRROR] Cleans up touch spells
2018-05-15 06:53:54 -05:00
ce98f9c444
Merge pull request #6746 from Citadel-Station-13/upstream-merge-37785
...
[MIRROR] Replaces loose tech storage boards with spawners
2018-05-15 06:53:25 -05:00
49b22d2673
Merge pull request #6745 from Citadel-Station-13/upstream-merge-37810
...
[MIRROR] Adds basic electronics to techwebs
2018-05-15 06:53:11 -05:00
f86af0ab41
Merge pull request #6743 from Citadel-Station-13/upstream-merge-37818
...
[MIRROR] Fix some missing icons
2018-05-15 06:52:32 -05:00
68fcab96a5
Splits up round table initialize, start, end and shutdown
2018-05-15 02:12:50 -05:00
7c3c270e2a
Merge branch 'master' into upstream-merge-37749
2018-05-15 00:50:13 -05:00
0877bdd4e5
Merge pull request #6663 from Citadel-Station-13/upstream-merge-37646
...
[MIRROR] Renames trait datums/character traits to quirks to differentiate them from the other trait system in the code
2018-05-15 00:47:59 -05:00
a379391dd3
Cleans up touch spells ( #37715 )
...
* Cleans up touch spells
* Silent param
* Oh god i'm blind.
2018-05-15 00:35:41 -05:00
b161047f71
Merge pull request #6747 from Citadel-Station-13/upstream-merge-37851
...
[MIRROR] Send jquery asset when initializing tooltips
2018-05-14 22:16:12 -05:00
a7b5415a19
Fixes wumborian fugu dead sprite ( #37832 )
2018-05-14 18:55:54 -05:00
ef7be078b5
Merge pull request #37851 from AutomaticFrenzy/patch/jquery-tooltips-2
...
Send jquery asset when initializing tooltips
2018-05-14 16:51:20 -05:00
3b03fa3a37
Replaces loose tech storage boards with spawners
2018-05-14 15:18:17 -05:00
9a1dfefb97
Merge pull request #37810 from 81Denton/techweb-electronics
...
Adds basic electronics to techwebs
2018-05-14 15:17:00 -05:00
7dc1c116d5
Merge pull request #37818 from AutomaticFrenzy/patch/missing-icons
...
Fix some missing icons
2018-05-14 15:13:33 -05:00
f9f42658e1
Merge pull request #6714 from Citadel-Station-13/upstream-merge-37760
...
[MIRROR] Fixed stacks sometimes having the wrong amount if created on another stack
2018-05-14 12:28:41 -05:00
21bc6c48ef
Update preferences.dm
2018-05-14 09:53:00 -05:00
c92a18f733
Update syndicate.dm
2018-05-13 22:07:01 -05:00
e990ac3ef7
Update preferences.dm
2018-05-13 22:06:35 -05:00
ccaddb17e2
Update wallets.dm
2018-05-13 20:59:02 -05:00
1123df32b3
Merge pull request #6740 from Citadel-Station-13/upstream-merge-37794
...
[MIRROR] Marginally to Mildly Improves Vending Machine, Burger, and Donut sprites.
2018-05-13 20:39:21 -05:00
8b5c2d3108
Merge pull request #6739 from Citadel-Station-13/upstream-merge-37525
...
[MIRROR] Replaces adding goliath plates to clothing and APLUs with a customizable tracking component
2018-05-13 20:38:49 -05:00
ca9f309ddb
Merge pull request #6738 from Citadel-Station-13/upstream-merge-37789
...
[MIRROR] Log dchat to the individual say log for a mob
2018-05-13 20:38:29 -05:00
4e8b096710
Merge pull request #6737 from Citadel-Station-13/upstream-merge-37765
...
[MIRROR] Adds swapping disks to the plantmanipulator
2018-05-13 20:37:54 -05:00
c462c16cc7
Marginally to Mildly Improves Vending Machine, Burger, and Donut sprites. ( #37794 )
...
* the rainbow of mediocrity rides again
* whoops that wasn't supposed to be there
* updated vending machine, burger, and donut sprites
they've all been improved marginally
* edits roborger a bit more
"bun" is flatter, has an antenna that blinks in agony
2018-05-13 19:47:01 -05:00
0511aaa5d5
Merge pull request #6736 from Citadel-Station-13/upstream-merge-37788
...
[MIRROR] Make admin heals also max out mood
2018-05-13 18:59:05 -05:00
3e090c4537
Merge pull request #6735 from Citadel-Station-13/upstream-merge-37816
...
[MIRROR] Fixes bike horn attack
2018-05-13 18:58:40 -05:00
c4a46ae194
Merge pull request #6734 from Citadel-Station-13/upstream-merge-37809
...
[MIRROR] Adds security jumpskirts this time with less broken github
2018-05-13 18:58:10 -05:00
bd9482aec8
Merge pull request #6733 from Citadel-Station-13/upstream-merge-37804
...
[MIRROR] Fixes living robots appearing as deactivated at round end
2018-05-13 18:57:25 -05:00
3f4f48dd2d
Merge pull request #6732 from Citadel-Station-13/upstream-merge-37805
...
[MIRROR] Buckled/pulled cultists cant be teleport summoned
2018-05-13 18:57:03 -05:00
bcd2b0a3b0
Replaces adding goliath plates to clothing and APLUs with a customizable tracking component ( #37525 )
...
add: Amount of goliath plates is now shown in examine for explorer suits and mining hardsuits.
I was peeved by being unable to tell whether the armour is upgraded or not except by trying to stick more plates on it.
I think a more correct way would be to add a plate amount var to these items similarly to APLU plating and then have description mention their amount and, for added transparency, that it's possible to improve it if there's 0 plates.
Please point the errors/wrongs in it, since "current armour value minus constant divided by value each plate adds" is rather clunky code.
2018-05-13 18:55:56 -05:00
0f9f43067d
Log dchat to the individual say log for a mob ( #37789 )
2018-05-13 16:59:45 -05:00
CitrusGender