shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
17,734 Commits 5 Branches 0 Tags
2fefc185d34c2069215bcab7277e8bbb61ac8bf6
Commit Graph
389 Commits
Author SHA1 Message Date
LetterJayandGitHub 87cc0e6c6f Merge pull request #7067 from Citadel-Station-13/upstream-merge-38360 
[MIRROR] Cleans up some logging
 2018-06-12 07:41:10 -05:00
orangesandletterjay 1d0f775f56 Merge pull request #38360 from ShizCalev/key-cleanup 
Cleans up some logging
 2018-06-11 22:29:27 -05:00
deathride58andGitHub a4345c8fdb Update stabilized.dm 2018-06-11 23:13:46 -04:00
deathride58andGitHub a2f1e9f47f Update _status_effects.dm 2018-06-11 23:13:11 -04:00
fludd12andletterjay c47c812fdf Fixes and Upgrades Stabilized Gold Extracts 2018-06-11 00:04:13 -05:00
deathride58andGitHub e279392386 Merge pull request #6962 from Citadel-Station-13/upstream-merge-38128 
[MIRROR] Standardizes and cleans up some admin messages & logging
 2018-06-09 05:53:25 +00:00
deathride58andGitHub b49458e0ba Merge branch 'master' into upstream-merge-38116 2018-06-05 21:30:21 +00:00
Jordan Brownandletterjay 5e15a988f6 Refactor machinery to default to being anchored 2018-06-01 11:28:19 -05:00
Dax Dupontandletterjay 7dd53d445e Stock parts sorter now use get_parts_rating (#38191) 2018-06-01 04:15:02 -05:00
ShizCalevandletterjay 4ae974644c Standardizes and cleans up some admin messages & logging 2018-05-31 22:41:31 -05:00
deathride58andkevinz000 2f9e3e403d Hard upstream sync (#6951) 
* maps - none of our changes included yet i'll get them in after i finish up the rest of the sync

* sync part 1 - underscore folders in code

* controllers folder

* datums folder

* game folder

* cmon, work

* modules - admin to awaymissions

* cargo to events

* fields to lighting

* mapping > ruins

* rest of the code folder

* rest of the folders in the root directory

* DME

* fixes compiling errors. it compiles so it works

* readds map changes

* fixes dogborg module select

* fixes typo in moduleselect_alternate_icon filepath
 2018-05-31 16:03:18 -07:00
CitadelStationBotandkevinz000 c2f9ff1358 [MIRROR] Anomaly Neutralizer (#6851) 
* Anomaly Neutralizer

* Update all_nodes.dm
 2018-05-27 17:20:37 -07:00
LetterJayandGitHub b6dabb1640 Merge pull request #6919 from Citadel-Station-13/upstream-merge-38095 
[MIRROR] [s] Blacklists TB grenade from experimentor.
 2018-05-27 14:42:32 -05:00
Dax Dupontandletterjay caf515f204 [s] Blacklists TB grenade from experimentor. (#38095) 2018-05-27 11:41:23 -05:00
ShizCalevandletterjay 786b062f61 Capitalizes CentCom (#38086) 
* Capitalized CentCom

* neediful
 2018-05-27 11:40:12 -05:00
LetterJay 8c77b2d700 vr sleeper removal 2018-05-25 17:35:06 -05:00
LetterJayandGitHub 6750abeb9e Merge pull request #6862 from Citadel-Station-13/upstream-merge-38020 
[MIRROR] Fix outdated R&D console comment
 2018-05-25 02:35:58 -05:00
CitadelStationBotandkevinz000 37f2768380 [MIRROR] Adds a missing + in techwebs point adjustment code (#6845) 
* Adds a missing + in techwebs point adjustment code

* Update _techweb.dm
 2018-05-24 20:55:23 -07:00
LetterJayandGitHub b89254ced7 Merge pull request #6807 from Citadel-Station-13/upstream-merge-37448 
[MIRROR] [READY]Refactors techwebs to have different types of points - PR HAS NO GAMEPLAY IMPACT
 2018-05-24 11:58:57 -05:00
Tad Hardestyandletterjay aec2e19b94 Fix outdated R&D console comment (#38020) 2018-05-23 16:12:04 -05:00
LetterJayandGitHub e4eb4939b4 Merge pull request #6636 from Citadel-Station-13/upstream-merge-37582 
[MIRROR] Makes more messages pronoun sensitive
 2018-05-23 07:46:26 -05:00
LetterJayandGitHub e7d9cd0698 Merge branch 'master' into upstream-merge-37597 2018-05-23 05:21:19 -05:00
LetterJayandGitHub 647aa4f306 Update charged.dm 2018-05-22 12:30:43 -05:00
LetterJayandGitHub 06b7cdf27a Merge branch 'master' into upstream-merge-37529 2018-05-22 08:02:46 -05:00
LetterJayandGitHub 488842a520 Update charged.dm 2018-05-22 08:01:29 -05:00
LetterJayandGitHub 5f27ac30c7 Merge branch 'master' into upstream-merge-37582 2018-05-22 07:22:42 -05:00
LetterJayandGitHub 6a575f19d1 Merge branch 'master' into upstream-merge-37597 2018-05-22 07:21:53 -05:00
LetterJayandGitHub adf1505c70 Merge pull request #6558 from Citadel-Station-13/upstream-merge-37486 
[MIRROR] Moves several clothing-specific flags from /atom to their proper type
 2018-05-22 07:18:34 -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 e57cf81636 Merge branch 'master' into upstream-merge-37582 2018-05-21 08:35:21 -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
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
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
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
AlexTheSysop42andletterjay 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
Dax Dupontandletterjay eb29d86c5f Fixes wrong circuits (#37853) 
* Fixes wrong circuits

* this too
 2018-05-16 12:04:54 -05:00
Jordan Brownandletterjay 9a1dfefb97 Merge pull request #37810 from 81Denton/techweb-electronics 
Adds basic electronics to techwebs
 2018-05-14 15:17:00 -05:00
LetterJayandGitHub f9f42658e1 Merge pull request #6714 from Citadel-Station-13/upstream-merge-37760 
[MIRROR] Fixed stacks sometimes having the wrong amount if created on another stack
 2018-05-14 12:28:41 -05:00
FrozenGuy5andletterjay e9ef82513c Add plasma rein glass to the ORM & adjusts material values on the various glass sheets (#37464) 
* Update smelting_designs.dm

* Tweaks material values on titanium glass.

* Optimizes math & fixes errors and inconsistencies
 2018-05-13 06:13:36 -05:00
LetterJayandGitHub cbfa3053ee Merge pull request #6692 from Citadel-Station-13/upstream-merge-37558 
[MIRROR] Anomaly Armour Research
 2018-05-12 21:36:51 -05:00
Tad Hardestyandletterjay 021f30f0c0 Fixed stacks sometimes having the wrong amount if created on another stack 2018-05-11 17:30:32 -05:00
Tad Hardestyandletterjay 111ad79eab Use spritesheets to reduce time spent sending PNG assets by 90+% 2018-05-09 22:44:57 -05:00
KorPhaeronandletterjay cc8fb19166 Anomaly Armour Research 2018-05-09 15:55:03 -05:00
deathride58andGitHub 50f8779fc0 Merge branch 'master' into upstream-merge-37486 2018-05-06 07:15:48 +00:00
deathride58andGitHub 6a07a66cb3 Merge branch 'master' into upstream-merge-37476 2018-05-06 07:07:02 +00:00