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
Zuhayr
115eb19d33
Merge branch 'bayupdate' of https://github.com/Zuhayr/Polaris into bayupdate
2016-02-06 14:30:51 +10:30
Datraen
4c0bd923c3
Merge pull request #866 from Kelenius/viroRemoval
...
Removes the old virus system
2016-02-05 21:06:09 -05:00
Zuhayr
408cb5d8d8
Adds a coverage check to xenoflora splattering, adjusts brainloss across
...
the board.
2016-01-31 11:49:14 +10:30
Zuhayr
f31438bd77
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into bayupdate
2016-01-30 08:49:35 +10:30
Kelenius
b86c730695
Removes the old virus system
...
Appendicitis moved to appendix organ
2016-01-27 11:44:41 +03:00
Zuhayr
d5b904ca2a
Merge branch 'master' of https://github.com/PolarisSS13/Polaris
2016-01-26 11:11:55 +10:30
Kearel
5727971690
Semi ports Baystation12/Baystation12#11445
2016-01-25 20:35:52 +00:00
Zuhayr
e557a71fdc
Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12
2016-01-20 08:01:14 +10:30
Kelenius
671b3b2d96
Removes copypaste
2016-01-18 16:04:01 +03:00
Kelenius
ee531578d7
Fixes #94
...
Protolathe and CI will now correctly eject materials.
2016-01-18 15:06:33 +03:00
Neerti
3cf4ffcd2b
Fixes ghost-callers being unable to hear linked communicators.
...
Fixes exonet node research pattern being wrong.
Makes communicators showing up on the ghost communicator list have stricter checks for being able to receive a request.
2015-12-16 16:01:52 -05:00
Neerti
3e5436c4b7
Upgrades communicators to NanoUI, adds a new EPv2 fake networking system, adds new semi-telecomms machine, lets communicators call ghosts, call other communicators, and have as many ghosts or communicators linked as the user desires. Adds preference option to remain invisible on communicator device searches.
2015-12-14 15:43:53 -05:00
PsiOmegaDelta
6a22086c17
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/game/verbs/suicide.dm
code/modules/nano/modules/crew_monitor.dm
2015-12-06 11:34:36 +01:00
Atlantis
c7e7c05a34
Fixes #11546
2015-12-02 11:14:41 +01:00
PsiOmegaDelta
26f167453c
Merge remote-tracking branch 'upstream/master' into dev-freeze
2015-11-22 11:40:44 +01:00
GinjaNinja32
8e1928062b
sulphuric acid is "sacid" not "acid"
2015-11-20 21:41:31 +00:00
Kelenius
531809efa2
Fixes #11347
...
Jesus Christ how horrifying
2015-11-10 14:15:37 +03:00
Neerti
4f77afece1
Revert 58ef59734f
2015-11-08 10:09:14 -05:00
Neerti
45f15930a0
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 11/6/2015_neerti_breaks_everything_bay_merge
...
Conflicts:
.travis.yml
code/_helpers/lists.dm
code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
code/global.dm
code/modules/client/preferences.dm
code/modules/client/preferences_savefile.dm
code/modules/reagents/dispenser/dispenser2.dm
polaris.dme
2015-11-06 17:41:18 -05:00
PsiOmegaDelta
42b98c45e4
Merge pull request #11220 from caelaislinn/new_xenoarch_sprites
...
Replaces xenoarch gun sprites with CC licenced alternatives from OpenGameArt.org
2015-11-03 11:14:03 +01:00
Cael Aislinn
105792686a
resprites xenoarch items (guns, eguns and other small stuff) and some large artifacts by skowron, reworks preset triggers to be a little more predictable for specific large artifact groups
...
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au >
2015-10-17 02:02:55 +10:00
Neerti
e52a0ea332
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into sync_to_bay_10/10/2015
...
Conflicts:
.travis.yml
code/game/gamemodes/changeling/changeling_powers.dm
code/game/gamemodes/changeling/modularchangling.dm
code/game/turfs/simulated.dm
code/global.dm
icons/misc/fullscreen.dmi
polaris.dme
2015-10-10 23:17:26 -04:00
HarpyEagle
38775120d7
Updates mechfab
...
Robolimb manufacturers are now handled specifically instead of assuming all
items follow the same constructor parameter rules.
2015-10-08 16:03:32 -04:00
mwerezak
83df0fa8f8
Makes powercells produced by the protolathe start uncharged.
2015-10-08 15:10:51 -04:00
Kelenius
83adba88d4
Updates blob
...
Remains of player blob axed.
blob_act() axed. Blob now has an arbitary set of things it can attack.
It will flow over everything else. Blob has an awful tendency to destroy
non-craftables.
Will test more tomorrow.
Blob will now attack mechs.
Fixes #8106 .
Fixes #10705 .
2015-10-05 18:10:16 +03:00