shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
13,720 Commits 5 Branches 0 Tags
fe63a4527facddf33cea14fd8aaacb8cfcd8db80
Commit Graph

67 Commits

Author SHA1 Message Date
deathride58
4ac2101d1a Merge pull request #5451 from deathride58/GIANTSYNCNUMBER2049623045 
TG Sync #4985279348672983476
 2018-02-14 04:11:44 +00:00
Dax Dupont
98c9e0948f Assblasts some power creep in circuit labs (#35506) 
* Circuit printers no longer start upgraded.

* Replaces roundstart upgraded printer with regular printer

* Replaces roundstart upgraded printer with regular printer w\ key remap
 2018-02-13 21:09:35 -06:00
deathride58
72ff7be9bd code folder. 221 files changed wew 2018-02-12 21:03:40 -05:00
ShizCalev
eb484edc2e Fixes scaner circuit typo (#35508) 2018-02-11 12:43:06 -06:00
CitadelStationBot
51d15518ae Merge pull request #5409 from Citadel-Station-13/upstream-merge-35456 
[MIRROR] [s] Fixes altclick exploits
 2018-02-11 09:43:09 -06:00
Dax Dupont
7992256bcb Grabbers can now only contain things smaller than the assembly. (#35462) 
* Grabbers can now only contain things smaller than the assembly

* Good suggestion buggy

* fucking github broke
 2018-02-11 05:08:41 -06:00
ShizCalev
f4685cfe01 [s] Fixes altclick exploits 2018-02-11 05:08:00 -06:00
Trevor Serpas
86e5775599 Integrated Circutry Readability Improvements (#35449) 
* Integrated Circutry Readability Improvements

* support for old save files and fix a var I missed
 2018-02-10 10:04:42 -06:00
Evsey Antonovich
c066120fc0 Circuit drone + grabber/thrower balance changes (#34834) 
* makes grabbers bulky and inventory max bulky

* makes circuit drones bulky

* removes drone stacking

* made grabbers max w class based on drone assembly, changed their w class back to small

* review stuff

* makes throwers max_w_class depend on assembly size

* uh

* kills sheer heart attack

* fuck off

* FUCK

* GR
 2018-02-08 03:11:12 -06:00
Iamgoofball
8e6aaf70c3 Cleans up wirer code. (#35116) 
* Cleans up wirer code.

🆑 Iamgoofball
fix: Minor code cleanup on the wirer
/🆑
 2018-01-30 22:44:49 -06:00
deathride58
8ee42a5282 Merge pull request #5090 from Citadel-Station-13/upstream-merge-34755 
[MIRROR] All color inputs use current color as default choice
 2018-01-26 15:44:23 +00:00
Jordan Brown
51e4d9f9db All color inputs use current color as default choice 2018-01-24 18:14:16 -06:00
Leo
2a0da701b2 Merge pull request #34801 from ShizCalev/DMM-viewer-fix 
Fixes compatability issues with some third-party-java-based™ DMM viewers
 2018-01-24 14:09:51 -06:00
kevinz000
54e9c47e99 Removes pulling claw instant messageless stun (#34742) 2018-01-22 15:45:15 -06:00
Jordan Brown
1639495adb Merge pull request #34637 from yorii/patch-1 
Fixes empty IC syringe having 0 transfer amount
 2018-01-19 08:52:41 -06:00
arsserpentarium
1d91243ae2 [READY]Pulling claw 2 (#33817) 
Pulling claw is integrated circuit,which allows drones to pull things.
 2018-01-11 14:03:52 -06:00
deathride58
3e937fcecf Merges #4679 , #4670 , and #4677 2018-01-07 15:29:42 -05:00
deathride58
5dc3f29ad4 modules - E to L 2018-01-04 00:53:38 -05:00
Leo
832b1d95df Merge pull request #34038 from ShizCalev/text-pad 
Fixes text pad window title
 2018-01-03 07:35:17 -06:00
LetterJay
a3ebaa5de8 Merge branch 'master' into upstream-merge-32311 2017-12-29 18:38:50 -06:00
oranges
269208f687 [READY]Component Forensics and Item Blood OverlayS! 2017-12-27 15:19:14 -06:00
deathride58
6dc2d8f0eb Update reagents.dm 2017-12-24 18:02:13 -05:00
arsserpentarium
a893559c6b [READY]Circuitry upgrades 2017-12-24 15:03:45 -06:00
LetterJay
8518a9b3e5 Merge pull request #4479 from Citadel-Station-13/upstream-merge-33703 
[MIRROR] Integrated circuit smoke circuit now requires atleast 10 units of reagents to generate smoke
 2017-12-21 04:58:06 -06:00
LetterJay
3973b368de Merge branch 'master' into upstream-merge-33470 2017-12-21 03:24:03 -06:00
Jordan Brown
e3a3082596 Merge pull request #33703 from kevinz000/patch-407 
Integrated circuit smoke circuit now requires atleast 10 units of reagents to generate smoke
 2017-12-21 00:46:48 -06:00
LetterJay
408182758f Merge branch 'master' into upstream-merge-33498 2017-12-19 17:50:11 -06:00
ACCount
522b8383d8 [READY]Refactors reagent container types 2017-12-18 22:54:51 -06:00
Emmett Gaines
f875d4e176 Defines math, take 2 2017-12-17 10:02:43 -06:00
LetterJay
7af461539f Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC" 2017-12-16 13:08:50 -06:00
KomradeSpectre
1cd746ba67 Adds two new Integrated Circuit components: hsv2hex converter and rgb2hex converter. (#33433) 
* Added two new components, HSV to Hex RGB and RGB to Hex RGB, along with icons.

* Added valid input ranges to the extended_desc of the new converter components.
 2017-12-15 17:13:20 -06:00
kevinz000
253c819bc1 TG Sync 12/15/17 
s

s
 2017-12-15 06:27:57 -08:00
deathride58
a4fafb2b51 Merge pull request #4357 from Citadel-Station-13/upstream-merge-33493 
[MIRROR] Fixes a couple Initialize procs
 2017-12-14 03:53:50 +00:00
JStheguy
9313fd65cf Adds Additional Electronic_Assembly Designs (#33466) 
* bloats electronic_setups.dmi

* new assembly naming scheme, redone legacy sprites
 2017-12-13 21:10:41 -06:00
Leo
77aa84af1d Fixes a couple Initialize procs 2017-12-13 14:13:43 -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
deathride58
0389214c7b Update reagents.dm 2017-12-10 20:55:08 -05:00
ACCount
a4129f92df Fixes integrated circuit reagent components not working while in mobs, adds new helper procs 2017-12-10 19:38:06 -06:00
Jordan Brown
3de5ed055f Merge pull request #33365 from KomradeSpectre/vox_circuit 
Adds AI Vox Sound Output Circuit
 2017-12-09 15:53:12 -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
ACCount
00279c71f0 IC fixes (#33215) 2017-12-04 04:53:12 -06:00
checkraisefold
96a064258f Spellcheck (#33214) 2017-12-03 12:42:10 -06:00
ACCount
0be326633d More integrated circuit fixes and code improvements 2017-11-26 04:56:44 -06:00
oranges
c43591982a Refactor on_reagent_change to pass through the change type 2017-11-24 12:59:09 -06:00
oranges
c2c22d56c7 [READY]NTnet refactor, assimilates exonet 2017-11-22 15:52:54 -06:00
deathride58
9f80325c52 Update power.dm 2017-11-21 14:20:03 -05:00
deathride58
e5cdbe29cc Update printer.dm 2017-11-21 14:18:42 -05:00
ACCount
8a64287249 Integrated circuit fixes and code improvements 2017-11-21 03:04:17 -06:00
deathride58
3dcd88b975 Merge pull request #4009 from Citadel-Station-13/upstream-merge-32788 
[MIRROR] Fixes inconsistencies w/ energy descriptions
 2017-11-19 05:16:15 +00:00
deathride58
68d9e90f96 Merge pull request #4005 from Citadel-Station-13/upstream-merge-32811 
[MIRROR] Fix for list pin in integrated circuits
 2017-11-19 04:27:43 +00:00