Commit Graph

203 Commits

Author SHA1 Message Date
kevinz000
a82d0e13ce Fixes RND 2017-12-22 00:58:46 -08:00
LetterJay
087c43ab71 Update rdmachines.dm 2017-12-21 12:44:59 -06:00
LetterJay
2d995e3f5a Update rdconsole.dm 2017-12-21 12:44:16 -06:00
LetterJay
8e6c8fc8b5 Update departmental_lathe.dm 2017-12-21 12:43:21 -06:00
LetterJay
6573aa52e4 Update departmental_circuit_imprinter.dm 2017-12-21 12:42:18 -06:00
LetterJay
3973b368de Merge branch 'master' into upstream-merge-33470 2017-12-21 03:24:03 -06:00
jughu
2c4e5bae9e Fixes grammer issue (#33679) 2017-12-20 12:02:25 -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
LetterJay
bd1c186111 Merge pull request #4377 from Citadel-Station-13/upstream-merge-33181
[MIRROR] All-In-One grinder results are now defined by type, not by huge lists
2017-12-17 21:26:08 -06:00
LetterJay
3895eb9eac Merge pull request #4375 from Citadel-Station-13/upstream-merge-33519
[MIRROR] Finishes the forceMove port
2017-12-17 20:28:07 -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
kevinz000
253c819bc1 TG Sync 12/15/17
s

s
2017-12-15 06:27:57 -08:00
deathride58
ebf0817c76 Merge pull request #4338 from Citadel-Station-13/upstream-merge-33468
[MIRROR] Designs now default to department flag ALL instead of NONE
2017-12-15 04:21:56 +00:00
Ashe Higgs
2aef00daf0 All-In-One grinder results are now defined by type, not by huge lists 2017-12-14 15:48:39 -06:00
vuonojenmustaturska
fcceb5ec77 Finishes the forceMove port 2017-12-14 15:40:08 -06:00
deathride58
7b4e1b2e6b Update designs.dm 2017-12-14 14:38:10 -05:00
Epoc
b2f24a3773 Adds Cybernetic Lungs to cyber_organs techweb node (#33490) 2017-12-13 22:09:56 -06:00
deathride58
7ca4a29cac Merge pull request #4354 from Citadel-Station-13/upstream-merge-33465
[MIRROR] Replaces a bunch of loc assignments with forcemoves and moves to nullspace
2017-12-14 03:54:31 +00:00
deathride58
2e83779018 Update destructive_analyzer.dm 2017-12-13 16:49:05 -05:00
Leo
51cce087d8 Fixes two unrelated runtimes 2017-12-13 14:12:26 -06:00
vuonojenmustaturska
7f90427a40 Replaces a bunch of loc assignments with forcemoves and moves to nullspace 2017-12-13 13:56:57 -06:00
Jordan Brown
c599e2fbc8 Designs now default to department flag ALL instead of NONE 2017-12-12 13:10:15 -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
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
deathride58
665cef7a35 Merge pull request #4260 from Citadel-Station-13/upstream-merge-33231
[MIRROR] Adds pet carriers
2017-12-08 18:46:07 +00:00
deathride58
d1490a18ed Update protolathe.dm 2017-12-08 13:42:41 -05:00
deathride58
32cfebfee7 Update circuitprinter.dm 2017-12-08 13:41:26 -05:00
Jordan Brown
dfaa796fc2 Fixes certain material containers 2017-12-08 12:11:46 -06:00
oranges
d619f206c6 Merge pull request #33235 from Fox-McCloud/xenobio-console
Slime Blueprint Change
2017-12-08 10:34:13 -06:00
Ashe Higgs
315e1d718a Adds pet carriers 2017-12-08 10:34:05 -06:00
deathride58
989102f552 Update protolathe.dm 2017-12-05 21:04:00 -05:00
deathride58
0f853fd744 Update circuitprinter.dm 2017-12-05 21:03:21 -05:00
deathride58
71d0804bce Update circuitprinter.dm 2017-12-05 18:26:41 -05:00
deathride58
838011614e Update rdmachines.dm 2017-12-05 17:47:38 -05:00
deathride58
db8ef8969d Update protolathe.dm 2017-12-05 17:47:12 -05:00
deathride58
15fd10790c Update circuitprinter.dm 2017-12-05 17:46:31 -05:00
deathride58
9c0eae753d Update circuitprinter.dm 2017-12-05 17:44:45 -05:00
Jordan Brown
e1f658a50d Removes ComponentActivated in favor of callbacks 2017-12-05 15:42:47 -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
379f73d1e1 Merge branch 'master' into upstream-merge-32249 2017-12-04 23:15:38 +00: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
kevinz000
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 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
deathride58
c9f0f4923f Update rdconsole.dm 2017-11-26 21:34:09 -05:00