shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
12,709 Commits 5 Branches 0 Tags
be61d258b95dc616fc92cbe0ee7e7ca147fd23fd
Commit Graph
229 Commits
Author SHA1 Message Date
CitadelStationBotandkevinz000 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
deathride58andGitHub 7ca945c96b Merge pull request #4278 from Citadel-Station-13/upstream-merge-33370 
[MIRROR] Fixes certain material containers
 2017-12-08 19:35:43 +00:00
deathride58andGitHub 665cef7a35 Merge pull request #4260 from Citadel-Station-13/upstream-merge-33231 
[MIRROR] Adds pet carriers
 2017-12-08 18:46:07 +00:00
deathride58andGitHub d1490a18ed Update protolathe.dm 2017-12-08 13:42:41 -05:00
deathride58andGitHub 32cfebfee7 Update circuitprinter.dm 2017-12-08 13:41:26 -05:00
Jordan BrownandCitadelStationBot dfaa796fc2 Fixes certain material containers 2017-12-08 12:11:46 -06:00
orangesandCitadelStationBot d619f206c6 Merge pull request #33235 from Fox-McCloud/xenobio-console 
Slime Blueprint Change
 2017-12-08 10:34:13 -06:00
Ashe HiggsandCitadelStationBot 315e1d718a Adds pet carriers 2017-12-08 10:34:05 -06:00
deathride58andGitHub 989102f552 Update protolathe.dm 2017-12-05 21:04:00 -05:00
deathride58andGitHub 0f853fd744 Update circuitprinter.dm 2017-12-05 21:03:21 -05:00
deathride58andGitHub 71d0804bce Update circuitprinter.dm 2017-12-05 18:26:41 -05:00
deathride58andGitHub 838011614e Update rdmachines.dm 2017-12-05 17:47:38 -05:00
deathride58andGitHub db8ef8969d Update protolathe.dm 2017-12-05 17:47:12 -05:00
deathride58andGitHub 15fd10790c Update circuitprinter.dm 2017-12-05 17:46:31 -05:00
deathride58andGitHub 9c0eae753d Update circuitprinter.dm 2017-12-05 17:44:45 -05:00
Jordan BrownandCitadelStationBot e1f658a50d Removes ComponentActivated in favor of callbacks 2017-12-05 15:42:47 -06:00
orangesandCitadelStationBot 4204c889ed Merge pull request #32964 from AutomaticFrenzy/patch/joules 
Measure energy values in joules
 2017-12-05 03:23:06 -06:00
deathride58andGitHub 379f73d1e1 Merge branch 'master' into upstream-merge-32249 2017-12-04 23:15:38 +00:00
deathride58andGitHub 64aadb868e Merge branch 'master' into upstream-merge-33213 2017-12-04 21:39:30 +00:00
deathride58andGitHub 7150e738e7 Update autolathe_designs.dm 2017-12-04 16:08:49 -05:00
AnturKandCitadelStationBot 1cc3e33714 Holorecord disks. 2017-12-04 05:14:13 -06:00
kevinz000andCitadelStationBot 66c66f0bd7 [READY]VEHICLE REFACTOR - Riding datums --> Components, Vehicles --> /obj/vehicle, staging for mech overhaul later on 2017-12-03 15:33:29 -06:00
Ashe HiggsandCitadelStationBot 5621507b4a Adds emergency lights, built into light fixtures 2017-12-03 12:54:48 -06:00
deathride58andGitHub e06b368fdb Update medical_designs.dm 2017-11-28 22:32:23 -05:00
ACCountandCitadelStationBot f089b9ca2d Removes mass-spectrometers 2017-11-28 06:27:55 -06:00
deathride58andGitHub c9f0f4923f Update rdconsole.dm 2017-11-26 21:34:09 -05:00
kevinz000andCitadelStationBot 437c527fd2 Fixes rdconsole emagging 2017-11-25 15:17:52 -06:00
deathride58andGitHub d5d89a57b4 Update stock_parts.dm 2017-11-23 23:50:25 -05:00
ACCountandCitadelStationBot 2147c60b7f Replaces "console screen" stock part with glass sheets 2017-11-23 18:53:47 -06:00
deathride58andGitHub c76cacdf77 Merge pull request #4081 from Citadel-Station-13/upstream-merge-32914 
[MIRROR] [READY]NTnet refactor, assimilates exonet
 2017-11-23 01:40:54 +00:00
deathride58andGitHub d5a8e2f13b Update telecomms_designs.dm 2017-11-22 20:10:41 -05:00
LetterJayandGitHub eba36e48f9 Merge pull request #3984 from Citadel-Station-13/upstream-merge-32188 
[MIRROR] JSON feedback
 2017-11-22 18:42:34 -06:00
orangesandCitadelStationBot c2c22d56c7 [READY]NTnet refactor, assimilates exonet 2017-11-22 15:52:54 -06:00
deathride58andGitHub b925c0e265 Update server.dm 2017-11-22 14:20:45 -05:00
Y0SH1M4S73RandCitadelStationBot 61ae95da33 Gives the R&D Server a description and makes its name improper 2017-11-21 22:28:23 -06:00
deathride58andGitHub 1f6b3ce629 Merge branch 'master' into upstream-merge-32188 2017-11-21 19:53:58 +00:00
deathride58andGitHub 3b0a71006c Update experimentor.dm 2017-11-20 22:32:20 -05:00
Jordan BrownandCitadelStationBot 2498e1ddc0 Cleans up unused code 2017-11-20 10:14:32 -06:00
ShizCalevandCitadelStationBot c2000cc31a Fixes inconsistencies w/ energy descriptions 2017-11-18 14:18:14 -06:00
deathride58andGitHub eeba86e27e Merge branch 'master' into upstream-merge-32188 2017-11-18 05:31:42 +00:00
JordieandCitadelStationBot b7e99a7448 JSON feedback 2017-11-17 01:44:12 -06:00
vuonojenmustaturskaandCitadelStationBot 6ce69fb2c8 Replaces a bunch of mob loops with hopefully better ones 2017-11-16 16:09:15 -06:00
arsserpentariumandCitadelStationBot d8847ea167 [READY]integrated circuitry port+upgrade. 2017-11-14 05:00:48 -06:00
orangesandCitadelStationBot 43113cd9b5 Merge pull request #31947 from AnturK/yarr 
How does this work:
Station receives a communication extorting current cargo point, if they answer yes the points are just gone and nothing of interest happens.

If station refuses to pay or is silent for 3 minutes, pirate shuttle spawns somewhere in space.

    There's an internal GPS onboard so crew will always be able to follow the shuttle.
    Crew of 3, moderately armed. (Balance pending)
    Shuttle engines have 3 minute cooldown between jumps.
    Special shuttle equipment will block cargo and emergency shuttles from leaving and slowly steal the points.
 2017-11-13 03:19:38 -06:00
LetterJayandGitHub 768e80544e Update autolathe_designs.dm 2017-11-12 15:41:25 -06:00
LetterJayandGitHub f812be1ee0 Update autolathe_designs.dm 2017-11-12 14:46:18 -06:00
LetterJayandGitHub 6286f4d4c2 Merge branch 'master' into upstream-merge-32161 2017-11-11 23:02:13 -06:00
PKPenguin321andCitadelStationBot 1aeb81cc25 Ensures sentienced animals know how to speak all the languages their master does (#32518) 
* Ensures sentienced animals know how to speak Common

* Give all of master's languages

* Languages
 2017-11-09 11:08:25 -06:00
vuonojenmustaturskaandCitadelStationBot 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
Jordan BrownandCitadelStationBot 4b297f509e 512 forward compatibility merge 2017-10-29 10:28:36 -05:00