shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
17,176 Commits 5 Branches 0 Tags
7c34029e78ea65be0331fa5bf264350b5af0e290
Commit Graph
10796 Commits
Author SHA1 Message Date
Jordan Brownandletterjay 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
Jordan Brownandletterjay 9095d48215 Merge pull request #37955 from AutomaticFrenzy/patch/airlock-autoclose 
Keep only the most recent airlock autoclose timer
 2018-05-21 16:29:09 -05:00
Jordan Brownandletterjay 60b3384695 Merge pull request #37965 from AnturK/whatthecommentsays 
Fixes fire_act working on deleted things.
 2018-05-21 16:27:55 -05:00
ShizCalevandletterjay 5964fa0712 Fixes defibillator runtime 2018-05-21 14:54:46 -05:00
LetterJayandGitHub be6fd4f0ca Update vg_hats.dm 2018-05-21 12:33:14 -05:00
LetterJayandGitHub f0c99c5f9c Update life.dm 2018-05-21 12:32:44 -05:00
LetterJayandGitHub 359d31238d Merge branch 'master' into upstream-merge-37486 2018-05-21 11:59:57 -05:00
Tad Hardestyandletterjay 6167423c85 Fix formatting when emagging an R&D console 2018-05-21 11:25:48 -05:00
LetterJayandGitHub 6489ef5511 Merge pull request #6550 from Citadel-Station-13/upstream-merge-37476 
[MIRROR] Uppercases slot defines.
 2018-05-21 11:23:02 -05:00
LetterJayandGitHub 931a950adb Merge branch 'master' into upstream-merge-37486 2018-05-21 08:59:32 -05:00
LetterJayandGitHub 39365437f5 Merge branch 'master' into upstream-merge-37293 2018-05-21 08:53:17 -05:00
LetterJayandGitHub 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
LetterJayandGitHub e57cf81636 Merge branch 'master' into upstream-merge-37582 2018-05-21 08:35:21 -05:00
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
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
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
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
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
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
Tad Hardestyandletterjay 9b4b9b4f34 Refresh mob views when atoms enter/exit storage (#37954) 2018-05-21 04:46:20 -05:00
kevinz000andGitHub 4582ed8c11 Update admin_verbs.dm 2018-05-21 02:34:03 -07:00
kevinz000andGitHub db415cb507 Update dice.dm 2018-05-21 02:32:14 -07:00
kevinz000andGitHub 2fd45f4eeb Create dice.dm 2018-05-21 02:31:14 -07:00
81Dentonandletterjay 1c51f32b31 Remove skewium from saferChems (#37925) 2018-05-21 03:57:05 -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
Nichandletterjay 177139a1d3 Replace nauseous with nauseated (#37927) 2018-05-21 03:06:39 -05:00
Mickyanandletterjay 2b9d18597b Remove intent auto switch from pacifism (#37938) 2018-05-21 02:54:14 -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
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
LetterJayandGitHub 0758204515 Merge branch 'master' into upstream-merge-37476 2018-05-20 23:12:07 -05:00
LetterJay 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
LetterJay 1e207a7430 modular_citadel 2018-05-20 23:04:13 -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
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 75144686a4 Update permissionedit.dm 2018-05-20 16:38:29 -05:00
LetterJayandGitHub 6da19f8dd0 Update emote.dm 2018-05-20 16:35:51 -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
LetterJayandGitHub a0b6b4e7d8 Update _trait.dm 2018-05-20 04:30:25 -05:00
LetterJayandGitHub c10c12596d Update boozeomat.dm 2018-05-20 03:18:24 -05:00
LetterJayandGitHub 65ef45eac6 Update _ears.dm 2018-05-20 02:37:36 -05:00
LetterJayandGitHub d5a4387c80 Update permissionedit.dm 2018-05-20 02:35:48 -05:00
LetterJayandGitHub 19b8053159 Update soulstone.dm 2018-05-20 02:33:33 -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 742e6a076a Update all_nodes.dm 2018-05-20 00:44:33 -05:00
kevinz000andletterjay d54667c81b [READY]Refactors techwebs to have different types of points - PR HAS NO GAMEPLAY IMPACT 2018-05-19 18:51:51 -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
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