shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
12,885 Commits 5 Branches 0 Tags
b0c94deff3e15a76743afef26c58f309d44a81b2
Commit Graph

76 Commits

Author SHA1 Message Date
Jordan Brown
c381c639cb Merge pull request #34906 from epochayur/master 
Removes Sulfuric Acid requirements from computer parts
 2018-01-26 03:00:32 -06:00
Leo
45c46f721e Merge pull request #34859 from tgstation/Cyberboss-patch-4 
Removes sulpheric acid requirement from express console circuits
 2018-01-25 05:09:41 -06:00
MrDoomBringer
8e090b430b Adds the Bluespace Drop Pod upgrade to the cargo express console 2018-01-23 01:36:43 -06:00
Dax Dupont
c2f5a85394 Adds the camera to the autolathe and changes the materials (#34636) 2018-01-21 21:24:18 -06:00
deathride58
9bf498c763 Merge pull request #4903 from Citadel-Station-13/upstream-merge-34291 
[MIRROR] Removes sulpheric acid requirement from most computer boards
 2018-01-18 04:59:08 +00:00
kevinz000
62c8371961 Removes sacid requirement 2018-01-17 16:02:57 -06:00
LetterJay
9598ca100b Shock collars 2018-01-15 02:04:32 -06:00
oranges
1f88c0c660 [READY]Cargo Update: Nanotrasen Supply Drop Pods! 2018-01-10 03:12:07 -06:00
deathride58
e4410a3320 Merge branch 'master' into mapsyncs43293845982 2018-01-08 06:18:11 +00:00
Jordan Brown
f9f6bae65d Merge pull request #34129 from MrDoomBringer/eminem 
Adds package wrapping to autolathes
 2018-01-07 20:07:00 -06:00
deathride58
aabbbb9dff aaaand the rest of the modules folder 2018-01-04 01:45:38 -05:00
kevinz000
a82d0e13ce Fixes RND 2017-12-22 00:58:46 -08:00
jughu
2c4e5bae9e Fixes grammer issue (#33679) 2017-12-20 12:02:25 -06:00
CitadelStationBot
cc0b768c72 [MIRROR] [READY] RND TECHWEBS + DEPARTMENTAL LATHES (#4014) 
* [READY] RND TECHWEBS + DEPARTMENTAL LATHES

* resetting all the maps because we can worry about them later.

* Regexing

* I'm fucked

* Fixes

* .

* maps

* bleh

* ree

* fixes
 2017-12-11 16:36:38 -08:00
Ashe Higgs
315e1d718a Adds pet carriers 2017-12-08 10:34:05 -06:00
oranges
4204c889ed Merge pull request #32964 from AutomaticFrenzy/patch/joules 
Measure energy values in joules
 2017-12-05 03:23:06 -06:00
deathride58
64aadb868e Merge branch 'master' into upstream-merge-33213 2017-12-04 21:39:30 +00:00
deathride58
7150e738e7 Update autolathe_designs.dm 2017-12-04 16:08:49 -05:00
AnturK
1cc3e33714 Holorecord disks. 2017-12-04 05:14:13 -06:00
Ashe Higgs
5621507b4a Adds emergency lights, built into light fixtures 2017-12-03 12:54:48 -06:00
deathride58
e06b368fdb Update medical_designs.dm 2017-11-28 22:32:23 -05:00
ACCount
f089b9ca2d Removes mass-spectrometers 2017-11-28 06:27:55 -06:00
ACCount
2147c60b7f Replaces "console screen" stock part with glass sheets 2017-11-23 18:53:47 -06:00
deathride58
d5a8e2f13b Update telecomms_designs.dm 2017-11-22 20:10:41 -05:00
oranges
c2c22d56c7 [READY]NTnet refactor, assimilates exonet 2017-11-22 15:52:54 -06:00
Jordan Brown
2498e1ddc0 Cleans up unused code 2017-11-20 10:14:32 -06:00
ShizCalev
c2000cc31a Fixes inconsistencies w/ energy descriptions 2017-11-18 14:18:14 -06:00
arsserpentarium
d8847ea167 [READY]integrated circuitry port+upgrade. 2017-11-14 05:00:48 -06:00
vuonojenmustaturska
cc438ea9b4 Refactors and improvements to xenobio slime processor (#32406) 
* Do not let your memes be dreams

* static lists for great justice

* Local man forgets to capitalize a word

* Slime processor no longer runtimes when processing food
 2017-11-05 04:32:07 -06:00
Robustin
a570ec8610 Adds the Chemistry Smoke Machine (#30920) 
* Smoke Machine

* Tweak

* More responsive smoke timing

* Antur Review and Admin Logs

* Cboss review

* More logging

* Removes analyze, streamlines logs

* r-e-a

* no s in reagents_list

* Cyberboss Review

* woops

* Cboss nitpicking
 2017-10-10 13:13:38 -05:00
Jordan Brown
58fd7f2067 Merge pull request #31413 from vuonojenmustaturska/codejanitoring 
Removes useless commented-out what-if code from the 1970s
 2017-10-08 10:00:34 -05:00
WewLads
7f77e08c0b Changed OneHuman to OneCrew lawset (#3172) 
* You can now slap butts

Disarm Intent + Target Groin = Butt Slap. Deals 1 damage to both the
victim's torso and the target's active hand.

* Fixed the drying rack

* Changes OneCrew to OneHuman

* Revert "Changes OneCrew to OneHuman"

This reverts commit 34e2ae378acff838013ed9c15ff85901740e9cdd.

* Revert "Revert "Changes OneCrew to OneHuman""

This reverts commit bc0f46d387ff7cd621b5331ad4d916f4a49ff2f0.

* Revert "Changes OneCrew to OneHuman"

This reverts commit 34e2ae378acff838013ed9c15ff85901740e9cdd.

* Changed OneHuman to OneCrew

* Revert "Fixed the drying rack"

This reverts commit 1351e2f38ed819b734a558fbeb9ef839cddf2b8f.

* Revert "You can now slap butts"

This reverts commit 9b1d6808d8e24cc9b2f5d28384b3ffe633d811fe.
 2017-10-06 11:36:52 -07:00
Kevak
f4ce4a3a27 Shock Collars Are Now A Thing. 
Exactly what it says on the tin.
 2017-10-03 08:03:03 -07:00
CitadelStationBot
6efb76fad5 [MIRROR] Ammo cleanup (#2643) 
* Ammo cleanup

* Update briefcase.dm

* Update manned_turret.dm

* Update mime.dm

* Update manned_turret.dm

* Update manned_turret.dm

* fixes

* mime memes
 2017-09-22 22:30:44 -05:00
CitadelStationBot
4dd0dc9d66 [MIRROR] Various grammar fixes (#2842) 
* Various grammar fixes

* Update mecha_parts.dm

* Update crates.dm

* Update ghost_role_spawners.dm

* Update paper_premade.dm

* Update oldstation.dm
 2017-09-17 22:35:51 -05:00
LetterJay
01b0e754c2 Merge pull request #2679 from Citadel-Station-13/upstream-merge-30531 
[MIRROR] Adds Donksoft Toy Vendor (Machine Board) to the Circuit Imprinter
 2017-09-12 02:35:17 -05:00
Firecage
1e0297f9ef Adds cybernetic lungs(and an upgraded and actually useful variety) to the game. (#30382) 
* Adds cybernetic lungs

* Added better cold thresholds to the upgraded cybernetic lungs. Heat threshold remains the same though for balance reasons.

* Adds an EMP effect to cybernetic lungs.
 2017-09-10 14:31:47 -05:00
Kerbin-Fiber
d158ec9528 Adds Donksoft Toy Vendor (Machine Board) to the Circuit Imprinter 2017-09-10 03:43:09 -05:00
LetterJay
188193eb61 here we go again (#2456) 2017-08-24 19:24:25 -07:00
CitadelStationBot
5fd31559ea [MIRROR] Fixed typo for cyberimp_surgical's ID (#2229) 
* Fixed typo for cyberimp_surgical's ID

* Delete medical_designs.dm.rej

* Update medical_designs.dm
 2017-08-05 10:29:02 -07:00
CitadelStationBot
fd59456a73 [MIRROR] Adds Surgical toolarms to R&D, makes them less robust (#2197) 
* Adds Surgical toolarms to R&D, makes them less robust

* Delete medical_designs.dm

* Delete augments_arms.dm

* Delete tools.dm
 2017-08-05 10:27:12 -07:00
CitadelStationBot
d2e771c9f3 Adds cybernetic organs (#2135) 2017-07-26 00:04:59 -07:00
CitadelStationBot
2d84e09851 Fixes plasma glass merging with normal glass 2017-07-08 09:45:46 -05:00
Poojawa
b1b4826c0c July 5th TG sync (#1883) 
July 5th TG sync
 2017-07-05 22:14:19 -05:00
CitadelStationBot
65736b7e23 [MIRROR] Ports the Ore Redemption Machine to TGUI (#1414) 
* Ports the Ore Redemption Machine to TGUI

* Update tgui.css

* Update tgui.js

* Delete tgui.css.rej

* Delete tgui.js.rej
 2017-06-28 02:24:55 -05:00
CitadelStationBot
2530d8a09a Intercoms are now constructable 2017-06-23 13:40:25 -05:00
CitadelStationBot
35ac6c40e0 Remember to test your PRs, kids! - Rebalances matter cartridge cost redux (#1652) 2017-06-20 07:59:04 -07:00
LetterJay
d65e8667e7 Merge pull request #1465 from Citadel-Station-13/upstream-merge-28160 
[MIRROR] Fixes ORM alloy material consumption
 2017-06-19 15:51:08 -05:00
CitadelStationBot
9273f20ff3 Removes tech requirement from flashes 2017-06-16 16:25:44 -05:00
LetterJay
4c1b223248 Merge pull request #1534 from Citadel-Station-13/SelectiveMirrorSync 
Selective mirror sync
 2017-06-14 06:41:01 -05:00