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
2e83779018
Update destructive_analyzer.dm
2017-12-13 16:49:05 -05:00
51cce087d8
Fixes two unrelated runtimes
2017-12-13 14:12:26 -06:00
7f90427a40
Replaces a bunch of loc assignments with forcemoves and moves to nullspace
2017-12-13 13:56:57 -06:00
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
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
665cef7a35
Merge pull request #4260 from Citadel-Station-13/upstream-merge-33231
...
[MIRROR] Adds pet carriers
2017-12-08 18:46:07 +00:00
d1490a18ed
Update protolathe.dm
2017-12-08 13:42:41 -05:00
32cfebfee7
Update circuitprinter.dm
2017-12-08 13:41:26 -05:00
dfaa796fc2
Fixes certain material containers
2017-12-08 12:11:46 -06:00
d619f206c6
Merge pull request #33235 from Fox-McCloud/xenobio-console
...
Slime Blueprint Change
2017-12-08 10:34:13 -06:00
315e1d718a
Adds pet carriers
2017-12-08 10:34:05 -06:00
989102f552
Update protolathe.dm
2017-12-05 21:04:00 -05:00
0f853fd744
Update circuitprinter.dm
2017-12-05 21:03:21 -05:00
71d0804bce
Update circuitprinter.dm
2017-12-05 18:26:41 -05:00
838011614e
Update rdmachines.dm
2017-12-05 17:47:38 -05:00
db8ef8969d
Update protolathe.dm
2017-12-05 17:47:12 -05:00
15fd10790c
Update circuitprinter.dm
2017-12-05 17:46:31 -05:00
9c0eae753d
Update circuitprinter.dm
2017-12-05 17:44:45 -05:00
e1f658a50d
Removes ComponentActivated in favor of callbacks
2017-12-05 15:42:47 -06:00
4204c889ed
Merge pull request #32964 from AutomaticFrenzy/patch/joules
...
Measure energy values in joules
2017-12-05 03:23:06 -06:00
379f73d1e1
Merge branch 'master' into upstream-merge-32249
2017-12-04 23:15:38 +00:00
64aadb868e
Merge branch 'master' into upstream-merge-33213
2017-12-04 21:39:30 +00:00
7150e738e7
Update autolathe_designs.dm
2017-12-04 16:08:49 -05:00
1cc3e33714
Holorecord disks.
2017-12-04 05:14:13 -06:00
66c66f0bd7
[READY]VEHICLE REFACTOR - Riding datums --> Components, Vehicles --> /obj/vehicle, staging for mech overhaul later on
2017-12-03 15:33:29 -06:00
5621507b4a
Adds emergency lights, built into light fixtures
2017-12-03 12:54:48 -06:00
e06b368fdb
Update medical_designs.dm
2017-11-28 22:32:23 -05:00
f089b9ca2d
Removes mass-spectrometers
2017-11-28 06:27:55 -06:00
c9f0f4923f
Update rdconsole.dm
2017-11-26 21:34:09 -05:00
437c527fd2
Fixes rdconsole emagging
2017-11-25 15:17:52 -06:00
d5d89a57b4
Update stock_parts.dm
2017-11-23 23:50:25 -05:00
2147c60b7f
Replaces "console screen" stock part with glass sheets
2017-11-23 18:53:47 -06:00
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
d5a8e2f13b
Update telecomms_designs.dm
2017-11-22 20:10:41 -05:00
eba36e48f9
Merge pull request #3984 from Citadel-Station-13/upstream-merge-32188
...
[MIRROR] JSON feedback
2017-11-22 18:42:34 -06:00
c2c22d56c7
[READY]NTnet refactor, assimilates exonet
2017-11-22 15:52:54 -06:00
b925c0e265
Update server.dm
2017-11-22 14:20:45 -05:00
61ae95da33
Gives the R&D Server a description and makes its name improper
2017-11-21 22:28:23 -06:00
1f6b3ce629
Merge branch 'master' into upstream-merge-32188
2017-11-21 19:53:58 +00:00
3b0a71006c
Update experimentor.dm
2017-11-20 22:32:20 -05:00
2498e1ddc0
Cleans up unused code
2017-11-20 10:14:32 -06:00
c2000cc31a
Fixes inconsistencies w/ energy descriptions
2017-11-18 14:18:14 -06:00
eeba86e27e
Merge branch 'master' into upstream-merge-32188
2017-11-18 05:31:42 +00:00
b7e99a7448
JSON feedback
2017-11-17 01:44:12 -06:00
6ce69fb2c8
Replaces a bunch of mob loops with hopefully better ones
2017-11-16 16:09:15 -06:00
d8847ea167
[READY]integrated circuitry port+upgrade.
2017-11-14 05:00:48 -06:00
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
768e80544e
Update autolathe_designs.dm
2017-11-12 15:41:25 -06:00
f812be1ee0
Update autolathe_designs.dm
2017-11-12 14:46:18 -06:00
deathride58