shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
16,816 Commits 5 Branches 0 Tags
6060df5b924f558f9033353bcd751bda65941b87
Commit Graph

10579 Commits

Author SHA1 Message Date
LetterJay
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
LetterJay
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
LetterJay
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
LetterJay
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
LetterJay
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
LetterJay
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
LetterJay
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
LetterJay
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
LetterJay
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
LetterJay
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 Hardesty
9b4b9b4f34 Refresh mob views when atoms enter/exit storage (#37954) 2018-05-21 04:46:20 -05:00
81Denton
1c51f32b31 Remove skewium from saferChems (#37925) 2018-05-21 03:57:05 -05:00
cyclowns
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
Nich
177139a1d3 Replace nauseous with nauseated (#37927) 2018-05-21 03:06:39 -05:00
Mickyan
2b9d18597b Remove intent auto switch from pacifism (#37938) 2018-05-21 02:54:14 -05:00
kevinz000
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-esistor
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
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 Brown
2fb886065b Merge pull request #37928 from nichlas0010/fixescommsconsoleupdates 
Comms consoles don't update while viewing messages
 2018-05-20 19:38:01 -05:00
LetterJay
6da19f8dd0 Update emote.dm 2018-05-20 16:35:51 -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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
ShizCalev
4e4e07e8bb Fixes mindswap book runtime (#37881) 2018-05-19 05:32:45 -05:00
ShizCalev
1a64bb27e9 Fixes changeling runtime after ghosting (#37892) 2018-05-19 05:32:36 -05:00
Mickyan
3e0eaa5e65 fixes g.blaster, neurotoxin, nuka cola dizzines (#37894) 2018-05-19 05:32:28 -05:00
AlexTheSysop42
ce400e716c Fixes experimentor pickweight and goo runtime (#37822) 
The experimentor is less likely to produce food when it transforms an item

The experimentor no longer breaks when the toxic waste malfunction occurs multiple times and isn't cleaned up

The experimentor irridiate function actually chooses what item to make properly rather than picking from the start of the list


The food weight change is because the probweight var wasn't effective because food was added to the list before anything that would increase the var, it's so low because there's a ton of food and it should be possible to get other things. I tested it in game and food is still the most common thing to get, I could bump up the prob for non-food things if needed.

The toxic waste runtime would make the experimentor unfixable except for reconstructing, and that resets the experiments.

The previous method of picking was broken and pretty poorly coded, I moved it to an associative list and the existing and non-broken pickweight function (not sure if this is also a code change).
 2018-05-19 04:48:27 -05:00
81Denton
5ed28b5cd2 Adds "proper" solar/gold/silver crates (#37890) 
* adds solar/gold/silver crates

* replaces pubbystation crates

* hhhh

* forgot adding spaces

* travis pls
 2018-05-19 02:14:00 -05:00
Tad Hardesty
36d4fe8866 Fix runtimes in mood rejuventation (#37911) 2018-05-19 01:51:21 -05:00
Dax Dupont
6eb9d6daaa Fixes mulligan for mutants (#37895) 2018-05-18 19:52:19 -05:00
Nich
ed556b2c0e Removes the ability for RD's to steal hand teles (#37908) 2018-05-18 19:51:06 -05:00
Iamgoofball
7f66ccfc2b Removes inherent toxin damage from lipolicide (#37874) 
* Removes inherent toxin damage from lipolicide

* Update description of lipolicide
 2018-05-18 16:47:20 -05:00
81Denton
8235db8b5c this violates the space geneva convention (#37903) 2018-05-18 16:46:05 -05:00