shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
18,250 Commits 5 Branches 0 Tags
dac62d3af288bd3ed430d1ac6bef990c54d779cf
Commit Graph
131 Commits
Author SHA1 Message Date
deathride58 3e18d8208e Updates to tgstation commit 78e471d 2018-07-05 01:22:27 -04:00
deathride58 ac6fddcfb3 Merge remote-tracking branch 'upstream/master' into hopefullythefinalhardsync 2018-07-05 00:17:44 -04:00
CitadelStationBotandkevinz000 6b0e597553 [MIRROR] Fix circuit printer printing finished TEG machinery (#7294) 
* Merge pull request #38844 from AutomaticFrenzy/patch/circuits

Fix circuit printer printing finished TEG machinery

* Fix circuit printer printing finished TEG machinery
 2018-07-02 03:23:49 -07:00
deathride58 b1688405d9 and finally, the modules folder. Now I can publish and take a break 2018-07-02 01:19:37 -04:00
Dennokandletterjay 58f634db63 deconstructable-TEG (#38656) 
Make TEG deconstructable.
 2018-07-01 05:41:53 -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
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
Jordan Brownandletterjay 9a1dfefb97 Merge pull request #37810 from 81Denton/techweb-electronics 
Adds basic electronics to techwebs
 2018-05-14 15:17:00 -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
KorPhaeronandletterjay cc8fb19166 Anomaly Armour Research 2018-05-09 15:55:03 -05:00
LetterJayandGitHub 0c5912c834 Merge pull request #6635 from Citadel-Station-13/upstream-merge-37626 
[MIRROR] You can no longer print infinite ammunition.
 2018-05-04 22:54:00 -05:00
CitadelStationBotandGitHub d574fc5590 Merge pull request #6622 from Citadel-Station-13/upstream-merge-37289 
[MIRROR] Science can now print off processors as well
 2018-05-03 09:07:59 -05:00
Dax DupontandCitadelStationBot a8a31c9e4b You can no longer print infinite ammunition. (#37626) 
* You can no longer print infinite ammunition.

* henk

lazy

anus

Reduces .38

Casings now give a tiny bit of metal so the janitor gets a buff

spacing
 2018-05-03 08:45:17 -05:00
pigeonsandCitadelStationBot 2702788dac Removes stock market 2018-05-02 17:48:55 -05:00
Grandmother of 50andCitadelStationBot 26fa3e1d12 Update machine_designs.dm (#37289) 2018-05-02 16:12:28 -05:00
deathride58andGitHub 7d01eeeb35 Merge pull request #6593 from Citadel-Station-13/upstream-merge-37556 
[MIRROR] More holosigns for techwebs
 2018-05-02 01:23:19 +00:00
deathride58andGitHub dca50e5d35 Merge pull request #6575 from Citadel-Station-13/upstream-merge-37349 
[MIRROR] Adds fly and moth categories to limb grower
 2018-05-02 01:21:37 +00:00
Jordan BrownandCitadelStationBot bf0fe93f35 Merge pull request #37556 from 81Denton/techweb-sunglasses 
More holosigns for techwebs
 2018-04-30 12:48:12 -05:00
kevinz000andPoojawa 3369c804b2 Kills off /obj/item/device (#6561) 2018-04-30 00:06:58 -05:00
erwgdandCitadelStationBot 2ca75d7de7 added fly and moth categories to limb grower and limbgrower_designs.dm (#37349) 
only human and lizard synthetic limbs will have should_draw_greyscale set to true

added /improper and uncapitalised synthetic limb names

removed plasmaman parts from human_parts_greyscale.dmi
 2018-04-29 17:52:44 -05:00
deathride58andGitHub d972ecc891 Merge pull request #6523 from Citadel-Station-13/upstream-merge-37407 
[MIRROR] Removes Acid from Remaining Circuits
 2018-04-27 09:39:29 +00:00
Jordan BrownandCitadelStationBot 4838bfec4e Merge pull request #37407 from Fox-McCloud/circuits-reagents 
Removes Acid from Remaining Circuits
 2018-04-26 15:24:26 -05:00
Dax DupontandCitadelStationBot d5c2d37e39 Makes radiation collectors buildable (#37363) 
* Makes radiation collectors buildable

* capitalism at it's finest

* a
 2018-04-24 07:13:16 -05:00
iksypandCitadelStationBot e8698ab798 Gives beer and soda dispensers their own circuitboards and Design ID's (#37315) 
* new boards

* new boards installed

* new designs (wow) (woah)

* added the new design ids to the biotech node

* tested

it works, also, that typo fucking stopped it from compiling
 2018-04-22 19:19:51 -05:00
Poojawaanddeathride58 5fa001c10f things with stuff (#6233) 
* buncha things from upstream

* datums globals, onclick

* datums

* game folder, holy shit mirror bot why

* modules

* icons

* dme

* compiles cleanly

* tools purge

* updates maps

* double check just because. and wew lad

* incidentally, this needs more work first

* some things

* weh

* sound cleanup and icons

* reeeee

* compile issues

* oh look, fresh code sync

* cleans up some unused icons

* dirty vars

* reeeeeeeeeeeeeeee

* wew lad. fuck off with this already
 2018-04-07 23:07:09 -04:00
TlaltecuhtliandCitadelStationBot 4f7d35ec4f fixes #34388 by adding cam (#36627) 
* wip fixes #34388

🆑 
fix:stuff
🆑

* vv

* ASDASD

* daikshu

* wwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwww

* wwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwww

* 99999999999999999999999999999

* *tabs*

* Update comp_board_designs.dm
 2018-04-06 09:24:47 -05:00
CitadelStationBotandPoojawa 7b3b1f65ec [MIRROR] Adds two new intermediate beaker types to chemistry (#6018) 
* Adds two new intermediate beaker types to chemistry

* YAY I DON'T HAVE TO KEEP UP WITH SNOWFLAKE ANYMORE

* Update all_nodes.dm
 2018-03-19 22:17:05 -05:00
CitadelStationBotandPoojawa 9338d18a28 [MIRROR] Techweb fixes (#6023) 
* Techweb fixes (#36513)

* Techweb fixes

* board

* robo

* Techweb fixes
 2018-03-19 21:18:35 -05:00
Mark9013100andCitadelStationBot 2686699c3e Pillbottles can now be made (#36083) 2018-03-09 14:24:35 -06:00
Dax DupontandCitadelStationBot 72e3ffa562 Beacons are no longer radios (#36070) 
* Refactors beacons

* Updates maps

* Done

* aaddddasddsafsdf
 2018-03-07 14:43:25 -06:00
vuonojenmustaturskaandCitadelStationBot e849ab23aa Advanced roasting sticks, for cooking sausages (#36071) 
* stick

* a commit

* almost forgot something

* seems to compile
 2018-03-04 15:41:23 -06:00
MMMiraclesandCitadelStationBot 5493339c7d Adds Tinfoil Hats (#35665) 
* adds a tinfoil hat to protect you from government conspiracies and aliens

* qutoes ples

* In the sheets of my sterilized room
In your comfy bed, air-conditioned car
There are vapors and toxins to get you all
In the water you drink, in the air that you breath
In the soil under your shoe

* conspiracy phobia, nodrop on hat once equipped, also CONTRAST

* a single comma

* cyberboss changes

* |=

* central typo fix
 2018-02-25 18:11:48 -06:00
Ashe HiggsandCitadelStationBot 063fc1a7af Circuit cloning balance: Timed cloning, reduced upgrade disk material cost (#35657) 
* Printing compromise

* Adds fast cloning to the upgraded printer

* sorry this took so long
 2018-02-25 14:47:06 -06:00
Ashe HiggsandCitadelStationBot 08bc84d3db Adds the dish drive, obtainable through techwebs and with circuit boards in the chef and bartender's lockers (#35759) 
* Adds the dish drive

* a e s t h e t i c

* Puts a dish drive circuit in the chef locker

* wardrobes, better control

* shiz!

* shiz! (x2)
 2018-02-20 17:10:40 -06:00
CitadelStationBotandPoojawa 1e65c813f0 [MIRROR] Extensive surgery additions (#5590) 
* Extensive surgery additions

* Update role_preferences.dm

* Update surgery_step.dm
 2018-02-19 10:48:11 -06:00
deathride58andGitHub 7063a07e6b Merge pull request #5564 from Citadel-Station-13/upstream-merge-35760 
[MIRROR] fixes flametrowers not being buildiable in the autolathe
 2018-02-19 00:04:04 +00:00
deathride58andGitHub b996d9353a Update autolathe_designs.dm 2018-02-18 18:29:04 -05:00
TlaltecuhtliandCitadelStationBot f4be7d0f5b fixes flametrowers not being buildiable in the autolathe 2018-02-18 11:33:21 -06:00
vuonojenmustaturskaandCitadelStationBot d4eab2acae borgmods 2018-02-18 11:33:12 -06:00
MMMiraclesandCitadelStationBot bd9ad82bbf Adds Cryostatis Shotgun Darts (#35342) 
* adds cryostatis shotgun darts, because shooting tiny water+potassium bombs into people is funny

* lowers amount from 15 to 10

* Update ammo_casings.dm
 2018-02-15 14:25:05 -06:00
Dax DupontandCitadelStationBot a0feb17597 Cell chargers are now buildable and (upgradable!) machines. 2018-02-12 11:15:52 -06:00
CitadelStationBotandGitHub 9025a3df29 Merge pull request #5418 from Citadel-Station-13/upstream-merge-35502 
[MIRROR] pet carriers can be actually made
 2018-02-11 09:43:17 -06:00
CitadelStationBotandGitHub 088ad78f95 Merge pull request #5414 from Citadel-Station-13/upstream-merge-35376 
[MIRROR] Buildable Shuttle/Plastitanium Windows
 2018-02-11 07:38:06 -06:00
LeoandCitadelStationBot b55fd38680 Merge pull request #35502 from Tlaltecuhtli/patch-1 
pet carriers can be actually made
 2018-02-11 07:34:51 -06:00
uraniummeltdownandCitadelStationBot e3ec8a648a Buildable Shuttle/Plastitanium Windows (#35376) 
* use titanium/plastitanium on unanchored reinforced fulltile window to make shuttle/plastitanium windows

* updates titanium/plastitanium sprites, adds titanium glass and plastitanium glass, fixes material amount in mineral glass
 2018-02-11 05:13:37 -06:00
MokirosandCitadelStationBot cdcb5fc72f Buildable and upgradable All-In-One Grinder (#35451) 
Circuit is in "Biological Processing" techweb node
 2018-02-11 05:12:23 -06:00
deathride58andGitHub a46fdf8750 Merge pull request #5390 from Citadel-Station-13/upstream-merge-35463 
[MIRROR] Cell blueprints now use the /empty variants
 2018-02-10 04:00:08 +00:00
Jordan BrownandCitadelStationBot 38fe1ac2fe Cell blueprints now use the /empty variants (#35463) 
* Cell blueprints now use the /empty variants

* Add empty stock cell
 2018-02-09 12:50:46 -06:00
Jordan BrownandCitadelStationBot 1ee8b3762b Merge pull request #35454 from DaxDupont/You-didn't-have-to-smile-at-me,-Your-grin's-the-sweetest-that-I've-ever-seen,But-you-did.-Yes-you-did 
Adds defib to techwebs
 2018-02-09 12:49:18 -06:00