c27d97a6e5
Merge pull request #37934 from AutomaticFrenzy/patch/ssping
...
Migrate goonchat pings to a subsystem
2018-05-21 16:40:29 -05:00
ec14a7c7ef
Merge pull request #37944 from AutomaticFrenzy/patch/irv-jquery
...
Remove second copy of jQuery used only by IRV polls
2018-05-21 16:33:42 -05:00
1766134062
Merge pull request #37943 from AutomaticFrenzy/patch/mind-over-matter
...
Fix mindswap forcibly enabling ambient occlusion
2018-05-21 16:31:21 -05:00
60b3384695
Merge pull request #37965 from AnturK/whatthecommentsays
...
Fixes fire_act working on deleted things.
2018-05-21 16:27:55 -05:00
be6fd4f0ca
Update vg_hats.dm
2018-05-21 12:33:14 -05:00
f0c99c5f9c
Update life.dm
2018-05-21 12:32:44 -05:00
359d31238d
Merge branch 'master' into upstream-merge-37486
2018-05-21 11:59:57 -05:00
6167423c85
Fix formatting when emagging an R&D console
2018-05-21 11:25:48 -05:00
6489ef5511
Merge pull request #6550 from Citadel-Station-13/upstream-merge-37476
...
[MIRROR] Uppercases slot defines.
2018-05-21 11:23:02 -05:00
931a950adb
Merge branch 'master' into upstream-merge-37486
2018-05-21 08:59:32 -05:00
39365437f5
Merge branch 'master' into upstream-merge-37293
2018-05-21 08:53:17 -05:00
6060df5b92
Merge pull request #6554 from Citadel-Station-13/upstream-merge-37267
...
[MIRROR] Adds log and management tabs to permissions panel
2018-05-21 08:42:21 -05:00
e57cf81636
Merge branch 'master' into upstream-merge-37582
2018-05-21 08:35:21 -05:00
0b26ea7b5e
Merge pull request #6823 from Citadel-Station-13/upstream-merge-37925
...
[MIRROR] Removes skewium from saferChems
2018-05-21 08:29:31 -05:00
cb5ea0aab7
Merge pull request #6822 from Citadel-Station-13/upstream-merge-37600
...
[MIRROR] Refactors hydrocarbon combustion + other general atmos code changes
2018-05-21 08:29:16 -05:00
52bd7904be
Merge pull request #6821 from Citadel-Station-13/upstream-merge-37927
...
[MIRROR] Replaces nauseous with nauseated
2018-05-21 08:29:00 -05:00
388c17664f
Merge pull request #6820 from Citadel-Station-13/upstream-merge-37938
...
[MIRROR] Fixes some issues with pacifism by disabling intent auto-switch
2018-05-21 08:28:47 -05:00
1afdd03d78
Merge pull request #6819 from Citadel-Station-13/upstream-merge-37937
...
[MIRROR] Emagging a R&D console now unlocks it and prevents it from being locked as opposed to nothing
2018-05-21 08:28:30 -05:00
1896bc86e8
Merge pull request #6817 from Citadel-Station-13/upstream-merge-37633
...
[MIRROR] Circuit Labels (sorta understanding git edition)
2018-05-21 08:28:13 -05:00
9121d4968e
Merge pull request #6789 from Citadel-Station-13/upstream-merge-37891
...
[MIRROR] Cleans up clap bodypart check
2018-05-21 08:27:57 -05:00
4582ed8c11
Update admin_verbs.dm
2018-05-21 02:34:03 -07:00
db415cb507
Update dice.dm
2018-05-21 02:32:14 -07:00
2fd45f4eeb
Create dice.dm
2018-05-21 02:31:14 -07:00
1c51f32b31
Remove skewium from saferChems ( #37925 )
2018-05-21 03:57:05 -05:00
7cc9d9103d
Refactors hydrocarbon combustion + other general atmos code changes ( #37600 )
...
* splits hydrocarbon combustion + other stuff
* nob max() thing
* whoops
* remove proc + new define
2018-05-21 03:21:08 -05:00
177139a1d3
Replace nauseous with nauseated ( #37927 )
2018-05-21 03:06:39 -05:00
2b9d18597b
Remove intent auto switch from pacifism ( #37938 )
2018-05-21 02:54:14 -05:00
73b0ac7859
Emagging a R&D console now unlocks it and prevents it from being locked as opposed to nothing ( #37937 )
...
* rdconsole emagging
* Fix grammar
2018-05-21 02:38:44 -05:00
63e472050c
Circuit Labels (sorta understanding git edition) ( #37633 )
...
* Customizable circuit names/descriptions
* Circuit descriptions are now copied
* Prevents code injection through the desc
2018-05-21 02:11:50 -05:00
0758204515
Merge branch 'master' into upstream-merge-37476
2018-05-20 23:12:07 -05:00
ea9b3622fd
Merge branch 'master' into upstream-merge-37476
...
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2018-05-20 23:11:16 -05:00
1e207a7430
modular_citadel
2018-05-20 23:04:13 -05:00
75144686a4
Update permissionedit.dm
2018-05-20 16:38:29 -05:00
6da19f8dd0
Update emote.dm
2018-05-20 16:35:51 -05:00
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
c10c12596d
Update boozeomat.dm
2018-05-20 03:18:24 -05:00
65ef45eac6
Update _ears.dm
2018-05-20 02:37:36 -05:00
d5a4387c80
Update permissionedit.dm
2018-05-20 02:35:48 -05:00
19b8053159
Update soulstone.dm
2018-05-20 02:33:33 -05:00
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
742e6a076a
Update all_nodes.dm
2018-05-20 00:44:33 -05:00
d54667c81b
[READY]Refactors techwebs to have different types of points - PR HAS NO GAMEPLAY IMPACT
2018-05-19 18:51:51 -05:00
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
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
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
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
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
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
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
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
oranges