Commit Graph

29439 Commits

Author SHA1 Message Date
Atermonera
da7ced30b9 Merge pull request #6328 from Nalarac/recharger
Makes Heavy-Duty Cell Chargers Constructable
2019-07-30 16:18:09 -08:00
Atermonera
5e38b8e401 Adds shutoff valve monitor (#6353)
* Adds shutoff valve monitor

* uses the other half of the mapmerger, hopefully appeases travis (it probably won't)
2019-07-30 17:03:28 -07:00
Anewbe
2a541f8304 Merge pull request #6349 from MagmaRam/b52fix
Fixes the metamorphic glass sprite for the B-52
2019-07-28 12:58:44 -05:00
Anewbe
1b8318fc4d Merge pull request #6351 from Heroman3003/fixthe3
Fixes 3 appearing to blind people when surgery table is used
2019-07-28 12:58:36 -05:00
Nalarac
5cda8072b7 Fixes Robots putting things in rechargers 2019-07-27 14:53:08 -05:00
Heroman
3211a3943d Fixes 3 appearing to blind people when surgery table is used 2019-07-28 05:50:41 +10:00
Andrew
1496ce2e65 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 0300e6723b, reversing
changes made to 219348783d.

* Revert "Revert "Merge branch 'master' into Turret""

This reverts commit ca3d13b337.

* Github why

* Change laser.dm to master?

* Revert "Change laser.dm to master?"

This reverts commit da562f6bc1.
2019-07-27 11:45:17 -08:00
Atermonera
e05e291029 Merge pull request #6331 from Nalarac/patch-4
Makes Husking Require More Burn
2019-07-27 11:09:31 -08:00
Atermonera
81941b16cb Merge pull request #6334 from Schnayy/clothingpack1
New Clothing & Sweaters
2019-07-27 11:08:41 -08:00
Andrew
ef7a9edf71 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 12:10:43 -05:00
Andrew
2ad4f437b9 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 12:06:58 -05:00
Anewbe
0a4b965a95 Merge pull request #6330 from Heroman3003/capitalf
Fixes fishing vendor's name
2019-07-27 12:06:29 -05:00
Anewbe
e3229fdbea Merge pull request #6343 from Nalarac/Circuits
Fixes Integrated Circuit Printer Taking Fractions of a Sheet
2019-07-27 12:05:50 -05:00
Andrew
d65913df29 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 12:05:23 -05:00
MagmaRam
02ae1026f5 Fixes the metamorphic glass sprite for the B-52 2019-07-26 17:50:19 -05:00
Atermonera
31518fef68 Merge pull request #6344 from Mechoid/ManifoldLeaking
Manifolds now obey the laws of pipes.
2019-07-24 23:11:54 -08:00
Mechoid
739caa1c1d Manifolds now obey the laws of pipes. 2019-07-24 17:27:27 -07:00
Nalarac
2451241d38 Fixes Integrated Circuit Printer Taking Fractions of a Sheet 2019-07-24 18:56:54 -05:00
Mechoid
814dac95a1 Shutoff valves now behave like other valves. (#6339)
* Shutoff valves now behave like other valves, and only attach to Regular pipes.

* Update polaris.dme
2019-07-24 13:37:17 -08:00
Andrew
504c28bc84 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 12:58:39 -08:00
Mechoid
40277238a4 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 00:44:59 -08:00
Schnayy
a1da64416a Adds new clothing sprites. 2019-07-24 02:11:16 -05:00
Atermonera
eceafe3528 Merge pull request #6323 from Heroman3003/dirtining
Makes roundstart dirt work more properly
2019-07-23 20:37:26 -08:00
Atermonera
3db8631f9b Merge pull request #6304 from Nalarac/Mecha2
Adds Ripley Speedboost Equipment
2019-07-23 20:01:36 -08:00
Atermonera
512c429102 Merge pull request #6290 from Mechoid/SubMunitions
Adds Submunition projectiles, and a laser gun showcasing them.
2019-07-23 19:34:09 -08:00
Andrew
bd782a5c22 Makes Husking Require More Burn
Makes you need 250 burn instead of 200 to husk a (human) body. Should make killing people with lasers/burns slightly less likely to result in a husk.
2019-07-23 16:33:50 -05:00
Atermonera
00bce77d9c Merge pull request #6285 from Mechoid/SLED
Adds the SLED.
2019-07-23 12:20:51 -08:00
Heroman
6ad4890ddd Fixes fishing vendor's name 2019-07-24 05:15:09 +10:00
Nalarac
4490e5b42a Makes Heavy-Duty Cell Chargers Constructable
Fixes robots being unable to upgrade regular (and wall) rechargers.

The heavy-duty cell recharger is constructed the same way as the regular recharger (with a unique frame).

The heavy-duty recharger can now be upgraded like the standard rechargers.
2019-07-23 12:11:08 -05:00
Nalarac
19c0a9b07e Special to Hull 2019-07-22 16:05:09 -05:00
Atermonera
b04582f3b1 Merge pull request #6321 from Nalarac/patch-2
Allows Longer Visible Text on Beakers
2019-07-21 20:43:57 -08:00
Atermonera
56848286bc Merge pull request #6320 from Nalarac/Autolathe
Allows Multiple Light Printing in Autolathe
2019-07-21 20:43:28 -08:00
Atermonera
75ac8b11ba Merge pull request #6316 from Heroman3003/phoronguard-again
Makes rigpieces phoron immune
2019-07-21 20:42:29 -08:00
Atermonera
3a6fe80c14 Merge pull request #6315 from Nalarac/Promethean
Replaces Promethean Mouse with Food
2019-07-21 20:42:02 -08:00
Atermonera
0c9167f18e Merge pull request #6314 from Nalarac/patch-1
Corrects Mining Vendor Entries
2019-07-21 20:41:47 -08:00
Atermonera
a0bfb917a0 Merge pull request #6308 from Heroman3003/kitchenfixes
Fixes some kitchen screwery
2019-07-21 20:41:29 -08:00
Heroman
b4915582cb Makes roundstart dirt work more properly 2019-07-22 05:36:32 +10:00
Andrew
ea918bbf20 Allows Longer Visible Text on Beakers
Changed it from showing at most 10 characters to 20
2019-07-20 18:22:59 -05:00
Nalarac
d6ab9c1fc7 Allows Multiple Light Printing in Autolathe
Allows light tubes and light bulbs to be printed 5 or 10 at a time.

Changes the is_stack var to be more general. Non-stack items with it will be able to produce 5 or 10 of said item at a time. This means it can be applied to other items if desired.
2019-07-20 15:22:47 -05:00
Heroman
2be7c50bd1 Makes rigpieces phoron immune 2019-07-20 14:26:54 +10:00
Nalarac
b856613f9a Replaces Promethean Mouse with Food
Gives them a protein bar instead
2019-07-19 18:47:13 -05:00
Andrew
9ed931432b Corrects Mining Vendor Entries
Buying the phoron bore will now yield a phoron bore instead of a sheet snatcher (and vise-versa)
2019-07-19 17:54:48 -05:00
Anewbe
f5693cafe6 Merge pull request #6284 from Atermonera/weather_app_atmos_reading
fixes communicator weather app's air reading
2019-07-19 15:19:07 -05:00
Anewbe
be28178c61 Merge pull request #6311 from Nalarac/Hivebot
Melee Mobs Can Attack with Pointblank
2019-07-19 15:18:59 -05:00
Andrew
f5f87e831e Emitters Hit Blob Again (#6310)
* Emitters Hit Blob Again

* Update overmind.dm

* Deletes line
2019-07-19 12:11:44 -08:00
Nalarac
9f1443c792 Melee Mobs Can Attack with Pointblank
If a mob has pointblank, but isn't ranged, it can now attack again.
2019-07-18 14:02:08 -05:00
Heroman
63f70a8a2c Fixes some kitchen screwery 2019-07-18 21:27:47 +10:00
Mechoid
a97a98e712 Update monitor_ward.dm 2019-07-16 20:29:27 -07:00
Mechoid
9872e79d31 On the tin. 2019-07-16 01:44:04 -07:00
Atermonera
17b139bac2 Merge pull request #6301 from Cerebulon/saltoid
Salt is Salt
2019-07-15 20:48:43 -08:00