Leshana
e004a8bfc0
Merge remote-tracking branch 'polaris/master' into sink
...
# Conflicts:
# code/_onclick/item_attack.dm
# code/modules/client/preferences.dm
# code/modules/mob/living/carbon/human/examine.dm
# code/modules/mob/living/simple_animal/hostile/hostile.dm
# code/modules/mob/new_player/preferences_setup.dm
# nano/images/nanomap_z1.png
# vorestation.dme
2016-05-29 16:22:07 -04:00
Leshana
3caec84482
Fix copy/paste error duplicating definition
2016-05-25 23:12:56 -04:00
Leshana
e37ac4da3e
Fixes #145 - Makes jukeboxes constructable.
...
* Adds circuit board.
* Adds design to print board on autolathe.
* Makes jukeboxes deconstructable back to frame.
2016-05-25 21:35:24 -04:00
Cameron653
f7c7b5eb3a
Removes pay bugfix
2016-05-23 14:06:06 -04:00
Cameron653
eb403b3d6d
Rename finds_eguns_vr to finds_eguns_vr.dm
2016-05-22 18:05:48 -04:00
Cameron653
5836b2c8cb
Create finds_eguns_vr
2016-05-22 17:48:58 -04:00
Cameron653
41a4cdd9d7
Fixes a typo
2016-05-21 00:29:39 -04:00
Cameron653
fbe0fcf5c5
Forgot to actually give it the equipped version!
2016-05-18 21:29:50 -04:00
Cameron653
982b972df6
Removes more redundancy.
2016-05-18 19:59:44 -04:00
Cameron653
21cf29a98a
Removes redundant sleeping
2016-05-18 19:51:58 -04:00
Cameron653
06520d444f
Xenoarch revamp, fixes icon bugs
2016-05-18 19:03:43 -04:00
Cameron653
ff16562d87
Nerfs the costs to make them and things required to make them
2016-05-18 17:32:34 -04:00
Cameron653
bb127db7e2
I forgot the vr
2016-05-18 17:29:43 -04:00
Cameron653
3b56e836c9
Makes Xenoarch Great Again
2016-05-18 17:28:18 -04:00
Cameron653
1793b9b318
Makes xenoarch pretty again.
2016-05-18 17:19:15 -04:00
SinTwo
5ae20ceb8b
Buildables v1.2 ( #1517 )
...
* Removes text2path, adds constructability to a few things, adds a locker_painter.dm, and several fixes.
* Fixes Maps due to working on ancient versions.
* Path error.
* Adds a missing ..()
2016-05-03 22:18:12 +01:00
EmperorJon
ebeaddea6e
Merge pull request #1414 from Mark9013100/4/15/2016tank_grammar
...
Fixes some punctuation
2016-04-20 13:23:51 +01:00
EmperorJon
482316ed55
Merge pull request #1368 from Neerti/4/6/2016_new_inventory_port
...
Ports Bay's new inventory system.
2016-04-16 02:58:07 +01:00
Mark9013100
06cff6d6af
Fixes some punctuation
2016-04-15 01:01:58 -04:00
Neerti
469c01daf9
Manually ports Bay's volume inventory system.
2016-04-06 03:31:21 -04:00
Datraen
ca24446d7f
Merge pull request #1287 from Kelenius/unitTests
...
Ports unit tests
2016-04-04 10:34:12 -04:00
Neerti
6d7b4bfd9f
Corrects issue in cherrypicking.
2016-03-31 16:29:48 -04:00
Daranz
9837c098eb
Further CallTechName() tweak
2016-03-31 16:11:42 -04:00
Daranz
baf49d0c23
Tweak CallTechName()
2016-03-31 16:11:13 -04:00
Daranz
2482ddf55a
Resolve problem with robot destructive analyzer
...
CallTechName() was borrowed from destructive_analyzer.dm for reuse in
the portable analyzer.
Resolves #12356
2016-03-31 16:10:07 -04:00
Kelenius
c8b510b415
Adds unit tests
...
Port of https://github.com/Baystation12/Baystation12/pull/11808 and
several others
Fixes three overlapping cables ([192 / 158 / 1], [214 / 161 / 1], [122 /
197 / 1])
Fixes drill and mech drill having the same ID.
2016-03-29 17:42:22 +03:00
Yoshax
d0d3d3cb16
Merge remote-tracking branch 'upstream/master' into morepreferences
2016-03-27 00:17:24 +00:00
Neerti
96e52f5af0
Merge pull request #1229 from SinTwo/construction_update
...
Construction update
2016-03-26 15:45:19 -04:00
Datraen
357fd67a65
Merge pull request #1159 from Kelenius/playingWithTravis
...
Attempts to port bay's travis update attempts
2016-03-26 13:18:55 -04:00
SinTwo
b356f5cf21
Construction Update
2016-03-25 16:02:36 -04:00
Neerti
faf538a832
Merge pull request #1246 from Datraen/XenoarchSpawnFix
...
Fixes a check in xenoarch master controller.
2016-03-24 12:17:07 -04:00
Datraen
4c9c5e5870
Fixes a check in xenoarch master controller.
2016-03-24 10:17:26 -04:00
Kelenius
e883863f4b
Merge branch 'master' into playingWithTravis
2016-03-23 17:12:11 +03:00
Neerti
a9ad84da4b
Merge pull request #1191 from Kelenius/inventoryCleanup
...
Mob inventory cleanup
2016-03-22 21:42:27 -04:00
Neerti
9027b0f391
Merge pull request #1221 from Ithalan/master
...
Fixes Anomaly Analyzer reading the wrong variable for the artifact effect's range
2016-03-22 21:36:42 -04:00
EmperorJon
aea690febf
Merge pull request #1222 from Datraen/XenoarchSpawnFix
...
[XENOARCH] Checks to see if the turf is a floor before spawning artifacts.
2016-03-22 22:34:52 +00:00
Ithalan
f3066a926f
Fixes Anomaly Analyzer reading the wrong variable for the effect's range, resulting in nearly all anomalies erronously showing as transmitting their effect on touch.
2016-03-22 02:27:31 +01:00
Yoshax
5d9596a72d
Makes it possible to have more than 16 preferences
2016-03-21 18:56:27 +00:00
Datraen
7f95bf177e
Checks to see if the turf is a floor before continuing to spawn artifacts.
2016-03-20 14:54:05 -04:00
Datraen
996ce92f7f
Merge pull request #1184 from Yoshax/510prep
...
Ports Byond 510 preperations from Bay
2016-03-20 13:45:40 -04:00
Kelenius
afbc235b96
Mob inventory cleanup
2016-03-15 16:39:40 +03:00
Kelenius
1d26fcfa8e
Moves a few vars where they should be
...
This should reduce the memory usage
2016-03-15 11:26:46 +03:00
Yoshax
8be10d96dd
Ports Byond 510 preperations from Bay
...
Updates comment
Updates supply file
2016-03-14 18:21:44 +00:00
Kelenius
3fdda5e8c5
Fixes issues travis found
2016-03-11 11:59:51 +03:00
Kelenius
63e8fbab46
Constructible drills
...
Mining head circuit available in R&D
Mining brace circuit added
Mining braces can be built and disassembled
2016-03-08 20:46:31 +03:00
Datraen
55a024ef14
Adds a mech flare launcher, can be mounted on any mech.
2016-02-24 21:15:48 -05:00
Yoshax
751647129b
Fixes #894
2016-02-20 02:51:41 +00:00
Zuhayr
7c3993b68b
Revert "Revert "Bay update.""
2016-02-07 16:33:30 +10:30
Zuhayr
98d983577c
Revert "Bay update."
2016-02-07 16:07:05 +10:30
Neerti
f2cd67fe16
Merge pull request #810 from Zuhayr/bayupdate
...
Bay update.
2016-02-05 23:21:07 -05:00
