shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
16,812 Commits 5 Branches 0 Tags
32cf8e6eb2323c363bb5024a859db86bd60f3339
Commit Graph
16812 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
LetterJayandGitHub 32cf8e6eb2 Merge pull request #6812 from Citadel-Station-13/upstream-merge-37928 
[MIRROR] Comms consoles don't update while viewing messages
 2018-05-21 08:30:19 -05:00
CitadelStationBot 50a8bc3de8 Automatic changelog generation for PR #6815 [ci skip] 2018-05-21 08:30:07 -05:00
LetterJayandGitHub 35ccd1aafe Merge pull request #6815 from Citadel-Station-13/upstream-merge-37905 
[MIRROR] Fix RPD icons not showing in IE8
 2018-05-21 08:30:05 -05:00
CitadelStationBot 0529a3e525 Automatic changelog generation for PR #6825 [ci skip] 2018-05-21 08:29:49 -05:00
LetterJayandGitHub 207c022f87 Merge pull request #6825 from Citadel-Station-13/upstream-merge-37954 
[MIRROR] Refresh mob views when atoms enter/exit storage
 2018-05-21 08:29:46 -05:00
CitadelStationBot add7e32628 Automatic changelog generation for PR #6823 [ci skip] 2018-05-21 08:29:33 -05:00
LetterJayandGitHub 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
LetterJayandGitHub 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
CitadelStationBot 601fcf1384 Automatic changelog generation for PR #6821 [ci skip] 2018-05-21 08:29:03 -05:00
LetterJayandGitHub 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
CitadelStationBot 0e09e1d683 Automatic changelog generation for PR #6820 [ci skip] 2018-05-21 08:28:49 -05:00
LetterJayandGitHub 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
LetterJayandGitHub 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
CitadelStationBot b3eab0058a Automatic changelog generation for PR #6817 [ci skip] 2018-05-21 08:28:15 -05:00
LetterJayandGitHub 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
LetterJayandGitHub 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
letterjay 8c7fbe2523 Refresh mob views when atoms enter/exit storage 2018-05-21 04:46:21 -05:00
Tad Hardestyandletterjay 9b4b9b4f34 Refresh mob views when atoms enter/exit storage (#37954) 2018-05-21 04:46:20 -05:00
letterjay 3241c9575d Removes skewium from saferChems 2018-05-21 03:57:06 -05:00
81Dentonandletterjay 1c51f32b31 Remove skewium from saferChems (#37925) 2018-05-21 03:57:05 -05:00
letterjay 07ee80f303 Refactors hydrocarbon combustion + other general atmos code changes 2018-05-21 03:21:08 -05:00
cyclownsandletterjay 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
letterjay 51f4840851 Replaces nauseous with nauseated 2018-05-21 03:06:39 -05:00
Nichandletterjay 177139a1d3 Replace nauseous with nauseated (#37927) 2018-05-21 03:06:39 -05:00
letterjay 09c0def840 Fixes some issues with pacifism by disabling intent auto-switch 2018-05-21 02:54:14 -05:00
Mickyanandletterjay 2b9d18597b Remove intent auto switch from pacifism (#37938) 2018-05-21 02:54:14 -05:00
letterjay 90d1fda2b1 Emagging a R&D console now unlocks it and prevents it from being locked as opposed to nothing 2018-05-21 02:38:44 -05:00
kevinz000andletterjay 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
letterjay ddec53bd6f Circuit Labels (sorta understanding git edition) 2018-05-21 02:11:50 -05:00
r-esistorandletterjay 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
CitadelStationBot 6963275d45 Automatic changelog generation for PR #6813 [ci skip] 2018-05-20 22:42:05 -05:00
CitadelStationBotandkevinz000 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
orangesandletterjay 16caaa5f2b Fix RPD icons not showing in IE8 2018-05-20 21:02:13 -05:00
letterjay f62f312895 Comms consoles don't update while viewing messages 2018-05-20 19:38:01 -05:00
Jordan Brownandletterjay 2fb886065b Merge pull request #37928 from nichlas0010/fixescommsconsoleupdates 
Comms consoles don't update while viewing messages
 2018-05-20 19:38:01 -05:00
LetterJayandGitHub 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
LetterJayandGitHub 6da19f8dd0 Update emote.dm 2018-05-20 16:35:51 -05:00
letterjay 8412d503b9 Updates BYOND links to use HTTPS 2018-05-20 15:31:28 -05:00
ShizCalevandletterjay 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
Alexch2andletterjay 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
iksypandletterjay 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
Armhulenandletterjay 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