Commit Graph

16778 Commits

Author SHA1 Message Date
kevinz000
2fd45f4eeb Create dice.dm 2018-05-21 02:31:14 -07:00
CitadelStationBot
6963275d45 Automatic changelog generation for PR #6813 [ci skip] 2018-05-20 22:42:05 -05:00
CitadelStationBot
845938bc73 [MIRROR] disables the chameleon gun from use (#6813)
* crashing the server with no survivors

* disables the chameleon gun from use
2018-05-20 20:42:02 -07:00
LetterJay
d0bc2e7bec Merge pull request #6809 from Citadel-Station-13/upstream-merge-37918
[MIRROR] Updates BYOND links to use HTTPS
2018-05-20 16:37:40 -05:00
letterjay
8412d503b9 Updates BYOND links to use HTTPS 2018-05-20 15:31:28 -05:00
ShizCalev
49bf67ed1d Updates BYOND links to use HTTPS (#37918)
* Updates BYOND links to use HTTPS

* revert

* if -> If
2018-05-20 15:31:28 -05:00
CitadelStationBot
12e1ab0855 Automatic changelog generation for PR #6805 [ci skip] 2018-05-20 00:44:47 -05:00
LetterJay
f412ab3873 Merge pull request #6805 from Citadel-Station-13/upstream-merge-37678
[MIRROR] Improves descriptions of Integrated Circuits
2018-05-20 00:44:45 -05:00
LetterJay
94d7c7b85c Merge pull request #6802 from Citadel-Station-13/upstream-merge-37910
[MIRROR] The Run Weather Verb, from "Adds acid geysers and seismic events to lavaland"
2018-05-19 17:18:24 -05:00
CitadelStationBot
aa449b309c Automatic changelog generation for PR #6804 [ci skip] 2018-05-19 17:18:08 -05:00
LetterJay
8a6fd47ab5 Merge pull request #6804 from Citadel-Station-13/upstream-merge-37607
[MIRROR] [READY] Gives Stacking Machines and their consoles machine boards
2018-05-19 17:18:06 -05:00
letterjay
8fcf4466ec Improves descriptions of Integrated Circuits 2018-05-19 17:12:35 -05:00
Alexch2
f172fed3e2 Improves descriptions of Integrated Circuits (#37678)
* Fixes a ton of typos, inaccuracies, poor grammar, and confusing weirdnesses from the descriptions of almost every integrated circuit.
For example, the reagent filter:

Before:
"This is a filter which will move liquids from the source to the target. It will move all reagents, except those in the unwanted list, given the fourth pin if amount value is positive, or it will move only desired reagents if amount is negative. The third pin determines how much reagent is moved per pulse, between 0 and 50. Amount is given for each separate reagent."

After:
This is a filter which will move liquids from the source to its target.
If the amount in the fourth pin is positive, it will move all reagents except those in the unwanted list.
If the amount in the fourth pin is negative, it will only move the reagents in the wanted list.
The third pin determines how many reagents are moved per pulse, between 0 and 50. Amount is given for each separate reagent."

* fixed, ready

* Actually fixed and ready.

* Reverts the name of the coordinate pathfinder circuit back to "coordinte"

* Fixes a few missed, or poorly rewritten parts.

* Update smart.dm
2018-05-19 17:12:34 -05:00
letterjay
d3718b1d0f [READY] Gives Stacking Machines and their consoles machine boards 2018-05-19 16:39:45 -05:00
iksyp
aae6ea0203 [READY] Gives Stacking Machines and their consoles machine boards (#37607)
* patch-2

* does everything on the TODO list

FUCK YEAH
*breaks up the engineering node design ID's for readability
*linking the device via multitool is possible
*The machinery construction "recipes" are less shit and make a bit more sense

* coil

* did somebody say RUNTIMES?

*fixed runtimes when there is no link on the stacking machine console
*added feedback for unlinked consoles
*it's -> its
*proper typecheck

* achieved with [src]
2018-05-19 16:39:45 -05:00
letterjay
90e0d79332 The Run Weather Verb, from "Adds acid geysers and seismic events to lavaland" 2018-05-19 14:52:21 -05:00
Armhulen
dc0ab280ac The Run Weather Verb, from "Adds acid geysers and seismic events to lavaland" (#37910)
* run weather!

* there we go.
2018-05-19 14:52:21 -05:00
CitadelStationBot
b026d21db9 Automatic changelog generation for PR #6770 [ci skip] 2018-05-19 09:15:48 -05:00
LetterJay
3d0f914a2c Merge pull request #6770 from Citadel-Station-13/upstream-merge-37869
[MIRROR] Adds Fernet, a digestif that reduces your satiety.
2018-05-19 09:15:46 -05:00
CitadelStationBot
b0bb2c8978 Automatic changelog generation for PR #6801 [ci skip] 2018-05-19 09:15:18 -05:00
LetterJay
0714d25f57 Merge pull request #6801 from Citadel-Station-13/upstream-merge-37881
[MIRROR] Fixes mindswap book runtime
2018-05-19 09:15:16 -05:00
LetterJay
33a6d7544f Merge pull request #6800 from Citadel-Station-13/upstream-merge-37892
[MIRROR] Fixes changeling runtime after ghosting
2018-05-19 09:15:03 -05:00
CitadelStationBot
650ba5e1c2 Automatic changelog generation for PR #6799 [ci skip] 2018-05-19 09:14:48 -05:00
LetterJay
cad56985a0 Merge pull request #6799 from Citadel-Station-13/upstream-merge-37894
[MIRROR] Fixes dizziness on some drinks
2018-05-19 09:14:46 -05:00
CitadelStationBot
7f0ad426f1 Automatic changelog generation for PR #6798 [ci skip] 2018-05-19 09:14:15 -05:00
LetterJay
86dd14699d Merge pull request #6798 from Citadel-Station-13/upstream-merge-37822
[MIRROR] Fixes experimentor pickweight and goo runtime
2018-05-19 09:14:13 -05:00
CitadelStationBot
100187c446 Automatic changelog generation for PR #6796 [ci skip] 2018-05-19 09:14:00 -05:00
LetterJay
86f69e2947 Merge pull request #6796 from Citadel-Station-13/upstream-merge-37890
[MIRROR] [Ready] Adds "proper" solar/gold/silver crates
2018-05-19 09:13:58 -05:00
LetterJay
bce4575679 Merge pull request #6795 from Citadel-Station-13/upstream-merge-37911
[MIRROR] Fix runtimes in mood rejuventation
2018-05-19 09:13:46 -05:00
CitadelStationBot
c038458192 Automatic changelog generation for PR #6794 [ci skip] 2018-05-19 09:13:33 -05:00
LetterJay
579e7997ff Merge pull request #6794 from Citadel-Station-13/upstream-merge-37895
[MIRROR] Fixes mulligan for mutants
2018-05-19 09:13:32 -05:00
CitadelStationBot
1c2edda40b Automatic changelog generation for PR #6793 [ci skip] 2018-05-19 09:13:10 -05:00
LetterJay
f5a53c32af Merge pull request #6793 from Citadel-Station-13/upstream-merge-37908
[MIRROR] Removes the ability for RD's to steal hand teles
2018-05-19 09:13:08 -05:00
CitadelStationBot
ee3c09efa3 Automatic changelog generation for PR #6792 [ci skip] 2018-05-19 09:12:44 -05:00
LetterJay
69b4813469 Merge pull request #6792 from Citadel-Station-13/upstream-merge-37874
[MIRROR] Removes inherent toxin damage from lipolicide
2018-05-19 09:12:42 -05:00
CitadelStationBot
f32c854751 Automatic changelog generation for PR #6791 [ci skip] 2018-05-19 09:12:26 -05:00
LetterJay
3a95262fb3 Merge pull request #6791 from Citadel-Station-13/upstream-merge-37903
[MIRROR] Buffs the bioterror kit
2018-05-19 09:12:24 -05:00
CitadelStationBot
8c63030a54 Automatic changelog generation for PR #6788 [ci skip] 2018-05-19 09:11:31 -05:00
LetterJay
5886e5add7 Merge pull request #6788 from Citadel-Station-13/upstream-merge-37898
[MIRROR] [s] Fixes oversight with foam
2018-05-19 09:11:29 -05:00
CitadelStationBot
b236716b44 Automatic changelog generation for PR #6787 [ci skip] 2018-05-19 09:11:10 -05:00
LetterJay
f0a8499efe Merge pull request #6787 from Citadel-Station-13/upstream-merge-37875
[MIRROR] Fixes radimmune mobs being killed by high bursts of radiation
2018-05-19 09:11:08 -05:00
LetterJay
8803db5ad5 Merge pull request #6784 from Citadel-Station-13/upstream-merge-37876
[MIRROR] Deltastation edits/fixes
2018-05-19 09:10:45 -05:00
LetterJay
88ad927838 Merge pull request #6772 from Citadel-Station-13/upstream-merge-37870
[MIRROR] Fixes decon message pronouns
2018-05-19 09:10:29 -05:00
letterjay
38f552c1b9 Fixes mindswap book runtime 2018-05-19 05:32:45 -05:00
ShizCalev
4e4e07e8bb Fixes mindswap book runtime (#37881) 2018-05-19 05:32:45 -05:00
letterjay
6ff0a55f92 Fixes changeling runtime after ghosting 2018-05-19 05:32:36 -05:00
ShizCalev
1a64bb27e9 Fixes changeling runtime after ghosting (#37892) 2018-05-19 05:32:36 -05:00
letterjay
ccc824217c Fixes dizziness on some drinks 2018-05-19 05:32:28 -05:00
Mickyan
3e0eaa5e65 fixes g.blaster, neurotoxin, nuka cola dizzines (#37894) 2018-05-19 05:32:28 -05:00
letterjay
a026c18f13 Fixes experimentor pickweight and goo runtime 2018-05-19 04:48:27 -05:00