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
ShizCalev
c2000cc31a
Fixes inconsistencies w/ energy descriptions
2017-11-18 14:18:14 -06:00
arsserpentarium
15c65004ca
Fix for list pin in integrated circuits ( #32811 )
...
* Update lists.dm
* Update pins.dm
* Update list_pin.dm
* Update power.dm
* Update input.dm
* Update pins.dm
* Update list_pin.dm
* Update input.dm
* Update lists.dm
* Update power.dm
* Update input.dm
* Update power.dm
2017-11-18 13:51:53 -06:00
ShizCalev
88da7f3d30
Cleans up unused circuitry code ( #32840 )
2017-11-18 13:51:14 -06:00
CitadelStationBot
0d8d2c50da
[MIRROR] Remove shocker circuit ( #3983 )
...
* Remove shocker circuit (#32758 )
* Remove shocker circuit
2017-11-17 00:24:50 -08:00
CitadelStationBot
1453373770
[MIRROR] Nerfs power regen on the regular tesla relay circuit. ( #3980 )
...
* Nerfs power regen on the regular tesla relay circuit. (#32782 )
* nerfed power regen on both variants of tesla circuit
* lines
* ill show you consistency
* Nerfs power regen on the regular tesla relay circuit.
2017-11-17 00:24:36 -08:00
kevinz000
8cf1266b72
[s] Sanitizes text input/output in circuits ( #32833 )
...
* Adds Sanitization to TTS
* Sanitize input
* stripped_input
* strip debugger input
* Stripped inputs in pin inputs.
* stripped pin input
* stripped string pin input
* stripped char input pin.
2017-11-17 00:36:29 -06:00
deathride58
41e1c38319
Merge pull request #3979 from Citadel-Station-13/upstream-merge-32791
...
[MIRROR] Grammar fixes on trig circuits
2017-11-17 02:02:18 +00:00
deathride58
458dbeaddf
Merge pull request #3978 from Citadel-Station-13/upstream-merge-32789
...
[MIRROR] Grammar fix on the logic gates
2017-11-17 02:01:48 +00:00
deathride58
858da24743
Merge pull request #3977 from Citadel-Station-13/upstream-merge-32790
...
[MIRROR] Grammar fixes on list circuits
2017-11-17 02:01:15 +00:00
deathride58
8e3bf4d248
Merge pull request #3976 from Citadel-Station-13/upstream-merge-32792
...
[MIRROR] Grammar fixes on output circuits.
2017-11-17 02:00:26 +00:00
Iamgoofball
078e4a09b1
Grammar fixes on trig circuits ( #32791 )
...
* Grammar fixes on trig circuits
* Update trig.dm
2017-11-16 18:36:36 -06:00
Iamgoofball
51c4f2667a
Grammar fix on the logic gates ( #32789 )
2017-11-16 18:35:25 -06:00
Iamgoofball
3daa75a240
Grammar fixes on list circuits ( #32790 )
2017-11-16 18:35:17 -06:00
Iamgoofball
6727273613
Grammar fixes on output circuits. ( #32792 )
...
* Grammar fixes on outputs
* Update output.dm
* Update output.dm
* Update output.dm
* Update output.dm
2017-11-16 18:34:06 -06:00
Anonmare
d648d971f7
Grammar checks circuit hypospray ( #32785 )
2017-11-16 17:09:00 -06:00
Jordie
eaa1d752a8
Merge pull request #32753 from optimumtact/wegetityouvape
...
Smoke circuit only notifies admins on first use and reagent change
2017-11-16 02:11:24 -06:00
