e60f0daf47
Merge pull request #6295 from Mechoid/TTS_And_Sign
...
Adds an advanced TTS circuit, and sign-camera.
2019-08-05 18:52:48 -04:00
25fbfb57d6
Merge pull request #5555 from VOREStation/upstream-merge-6366
...
[MIRROR] Tweaks Security Bots
2019-08-03 13:19:58 -04:00
ac2f51ab2d
Merge pull request #5554 from VOREStation/upstream-merge-6367
...
[MIRROR] Fixes Medibots Targetting FBPs
2019-08-03 13:19:17 -04:00
638579f26a
Merge pull request #6366 from Nalarac/Bot2
...
Tweaks Security Bots
2019-08-03 13:05:55 -04:00
5563462171
Merge pull request #6367 from Nalarac/Bot3
...
Fixes Medibots Targetting FBPs
2019-08-03 13:04:43 -04:00
62774db0b3
Merge pull request #6361 from Nalarac/Helmet-Cameras
...
Changes Space Helmet Cameras to a Verb
2019-08-03 13:03:30 -04:00
7977f50b1c
Merge pull request #6359 from Nalarac/patch-5
...
Updates Supermatter Guide Book
2019-08-02 14:06:45 -04:00
20a9e4ed3d
Merge pull request #6360 from Atermonera/changelog
...
chagelong
2019-07-31 18:45:44 -04:00
d5b416f70b
Merge pull request #5542 from VOREStation/upstream-merge-6328
...
[MIRROR] Makes Heavy-Duty Cell Chargers Constructable
2019-07-31 02:10:06 -04:00
35e0eeec78
Makes Heavy-Duty Cell Chargers Constructable
2019-07-30 20:18:33 -04:00
60c415cf64
Adds shutoff valve monitor
2019-07-30 20:04:51 -04:00
d844f233c4
Merge pull request #5508 from VOREStation/upstream-merge-6279
...
[MIRROR] Pipe Clamps, Shutoff Valves, and Leaking Tubes, oh my.
2019-07-30 19:50:02 -04:00
822339925c
Merge pull request #5527 from VOREStation/upstream-merge-6352
...
[MIRROR] Changelog
2019-07-27 17:40:39 -04:00
50136a254c
Merge pull request #5510 from VOREStation/upstream-merge-6303
...
[MIRROR] Combat Mechs Can Punch More Things
2019-07-27 17:40:22 -04:00
b876ff01fb
Changelog
2019-07-27 16:34:13 -04:00
8f00834eb8
Merge pull request #5526 from VOREStation/upstream-merge-6324
...
[MIRROR] Adds Laser Tag Turrets Plus Changes
2019-07-27 16:26:30 -04:00
83a2cb7490
Merge pull request #5525 from VOREStation/upstream-merge-6331
...
[MIRROR] Makes Husking Require More Burn
2019-07-27 16:24:49 -04:00
fad621705a
Merge pull request #5524 from VOREStation/upstream-merge-6334
...
[MIRROR] New Clothing & Sweaters
2019-07-27 16:24:32 -04:00
b37c0a06de
Merge pull request #5523 from VOREStation/upstream-merge-6335
...
[MIRROR] Bar Sign Changes
2019-07-27 16:24:02 -04:00
6a639e7ae6
Merge pull request #5522 from VOREStation/upstream-merge-6329
...
[MIRROR] Adds Specialized SMES Coils to Suppy Console
2019-07-27 16:23:33 -04:00
9b0c54b513
Merge pull request #5520 from VOREStation/upstream-merge-6325
...
[MIRROR] Fixes Repairing Bots
2019-07-27 16:23:08 -04:00
79eb2e57a5
Merge pull request #5519 from VOREStation/upstream-merge-6347
...
[MIRROR] Cyborgs Can See and Repair Holes in Ceiling
2019-07-27 16:22:49 -04:00
69ed422019
Adds Laser Tag Turrets Plus Changes ( #6324 )
...
* Adds Laser Tag Turrets
* Adds changelog
* Reverts Lethal Turrets Shooting to Kill
* Small No Longer Means Misc Life
* Revert "Merge branch 'master' into Turret"
This reverts commit 0300e6723b1aec0c47f8f82f7db770aa29af2483, reversing
changes made to 219348783d49b3205c3ed64bdd604f61791e6e72.
* Revert "Revert "Merge branch 'master' into Turret""
This reverts commit ca3d13b3372f2c5587d8d2cc449a6da8503494e4.
* Github why
* Change laser.dm to master?
* Revert "Change laser.dm to master?"
This reverts commit da562f6bc1ec43fe0cf5fe6ec5af61ada3474dd9.
2019-07-27 15:45:58 -04:00
d464d5560d
Merge pull request #6331 from Nalarac/patch-4
...
Makes Husking Require More Burn
2019-07-27 15:10:26 -04:00
de27063ae1
Merge pull request #6334 from Schnayy/clothingpack1
...
New Clothing & Sweaters
2019-07-27 15:09:11 -04:00
51ed300a96
Merge pull request #6335 from Schnayy/barsigns1
...
Bar Sign Changes
2019-07-27 15:07:55 -04:00
b30f9ffd0f
Adds Specialized SMES Coils to Suppy Console ( #6329 )
...
* Adds Specialized SMES Coils to Suppy Console
The capacitance and transmission coils are order-able for 90 points in the engineering section. (Standard coil is 75)
* Adds changelog
2019-07-27 13:11:34 -04:00
9d4f42ca29
Fixes Repairing Bots ( #6325 )
...
* Fixes Repairing Bots
You can now repair beepsky, slime securitrons, and other bots if they get damaged
* Can Fix Emag
* Updates changelog
* fix rcsadd to rscadd
2019-07-27 13:08:06 -04:00
e6f54d671a
Cyborgs Can See and Repair Holes in Ceiling ( #6347 )
...
* Cyborgs Can See and Repair Holes in Ceiling
* Adds changelog because I keep forgetting
2019-07-27 13:06:52 -04:00
07811148c3
Merge pull request #6343 from Nalarac/Circuits
...
Fixes Integrated Circuit Printer Taking Fractions of a Sheet
2019-07-27 13:06:42 -04:00
e4deaa6478
Combat Mechs Can Punch More Things ( #6303 )
...
* Combat Mechs Can Punch More Things
Removes the var to check for the 5 things it can attack, instead it can punch anything (but not everything will take damage).
Gives punching objects a check so you don't accidently smash something without meaning to.
Gives closets and canisters a proc to take_damage so they'll actually get smashed by the mechs.
* Take_Damage Boogaloo
* More take_damage Stuff
Adds click delay on attacking barriers.
Proper noises when attacking material doors and barricades.
More stuff can be broken by mech punch and simple mobs.
* Adds changelong
* usr to user
2019-07-24 17:00:24 -04:00
3fcc7e1465
Merge pull request #5500 from VOREStation/upstream-merge-6285
...
[MIRROR] Adds the SLED.
2019-07-24 06:24:34 -04:00
5864447d5d
Pipe Clamps, Shutoff Valves, and Leaking Tubes, oh my. ( #6279 )
...
* Pipe Clamps, Shutoff Valves, and Leaking Tubes, oh my.
* Fix processing fuckery.
* Deal with Forever-Seals, and Infini-clamps.
* Update clamp.dm
2019-07-24 04:46:28 -04:00
f0311ed4ff
Merge pull request #6304 from Nalarac/Mecha2
...
Adds Ripley Speedboost Equipment
2019-07-24 00:02:48 -04:00
a6d7c4ee81
Merge pull request #6285 from Mechoid/SLED
...
Adds the SLED.
2019-07-23 16:21:42 -04:00
7109e22c3f
Merge pull request #6313 from Atermonera/changelog
...
itty bitty changelog
2019-07-20 13:28:03 -04:00
8c01080dba
Nalarac's Farmbot Tweak ( #6297 )
...
* Nalarac's Farmbot Tweak
Adding access_xenobiology to the permission levels for Farmbots so xenobotanists can make use of the bugger. Doing this on behalf of Nalarac, using work from https://github.com/PolarisSS13/Polaris/pull/6288
* Revert "Nalarac's Farmbot Tweak"
This reverts commit bba618a39687574fd7b7fed463aa8f03ba4c5b4e.
* Test Comment Addition
* Back on Track
Restores reverted line and re-adds CL. This compiles FINE in everything BUT here. Think it's just Travis being buggy or something.
2019-07-13 15:58:28 -04:00
0922d4d79a
Merge pull request #6281 from Woodratt/20190708_maptweaksv3
...
Mapfixesv3
2019-07-11 23:58:07 -04:00
21c89249c6
Merge pull request #6273 from Atermonera/changelog
...
changelog
2019-07-07 18:01:05 -04:00
bb7b3fe9cc
Merge pull request #5376 from mistyLuminescence/customsay
...
Custom Say Verbs
2019-07-05 07:03:50 -04:00
58c2b2311e
Merge pull request #6247 from mistyLuminescence/zruntime
...
Fixes runtime and GPS problem with invalid Z-levels
2019-07-01 20:46:10 -04:00
c406672c26
Adds two new Cargo crates!
2019-06-29 19:46:41 -04:00
d731589ba0
Merge pull request #6238 from Heroman3003/broken-components
...
QoL improvements for broken components
2019-06-29 04:08:30 -04:00
cd605c4228
Merge pull request #5384 from mistyLuminescence/tether
...
Tether Z bugfixes
2019-06-28 21:41:07 -04:00
ece1a9e88f
Merge pull request #6228 from Atermonera/changelog
...
golegchan
2019-06-28 21:23:32 -04:00
b0f5d66c26
Tether Z bugfixes
2019-06-29 00:27:23 +01:00
e2b4317366
Custom Say Verbs
2019-06-26 18:52:36 +01:00
5c5275761b
Merge pull request #6217 from mistyLuminescence/poiname
...
POI Names
2019-06-24 15:24:33 -04:00
664fcbcffe
Merge pull request #5359 from VOREStation/upstream-merge-6206
...
[MIRROR] tinytweaks
2019-06-21 18:13:49 -04:00
711e807d32
tinytweaks
2019-06-21 17:07:51 -04:00
Atermonera