Commit Graph

7362 Commits

Author SHA1 Message Date
Novacat 7f49c680e5 Ports MREs from Baystation (#6424)
* Ports MREs from Baystation

- Ports MREs from Baystation
- Adds an 'Emergency ration' that contains liquidfood rations
- Two new ration packs that have the new rations.

* Placates travis

* Lynxlog

* Adds liquidprotein rations

* Sacrifice for travis

* Changes desc

* Fixing missing filling in crayon paste

* Fixes missing side for random rations

* Renames Paste Supplypack

* aaaaa minor error

* Slight organization

* Fixes some errors

* Why am I like this
2019-08-31 14:00:14 -08:00
Anewbe 9b5573eee6 Merge pull request #6429 from Heroman3003/idfix
Fixes editing colony director IDs editing global 'station access' list
2019-08-29 17:26:45 -05:00
Heroman c1ec00ef62 Undoes unnecesary Copy() 2019-08-28 19:03:01 +10:00
Heroman daadfd6a72 Fixes editing colony director IDs editing global 'station access' list 2019-08-28 19:02:35 +10:00
Atermonera 8f85cb4387 Merge pull request #6418 from MisterLayne/glass_shard_self_harm
Shards Do Damage to Holder
2019-08-27 21:23:52 -08:00
MisterLayne 13a221cf5b Adds changelog. 2019-08-26 10:02:50 -04:00
MisterLayne e892f25e3d F i n a l l y. 2019-08-26 09:55:59 -04:00
MisterLayne 5a21f6dc57 Still complete garbage. 2019-08-23 14:35:20 -04:00
MisterLayne 382f04898a A mangled and unfinished shitstorm of code. 2019-08-23 14:26:44 -04:00
MisterLayne 7d4c49f45e Praise limb-stump jesus! 2019-08-22 10:37:23 -04:00
Heroman c01ba2b973 Adjusts some bell mechanics 2019-08-22 15:38:52 +10:00
Atermonera 0069b9d980 Merge pull request #6396 from Mechoid/ChemistryAdvancement
Chemistry Expansion
2019-08-21 13:42:08 -08:00
Mechoid f294be6c56 Exploration Expansion 1: Or, How I Learned To Love The Tree (#6358)
* Mechoid code everything!

* Telecube

* Adds 2 PoIs

* H u g e commit.
2019-08-21 13:21:33 -08:00
Atermonera 8b11946e67 Merge pull request #6386 from TheFurryFeline/TFF-Orange_Is_The_New_Orange
Freebie Orange Jumpsuit
2019-08-12 10:39:30 -08:00
Atermonera 8316113fa0 Merge pull request #6393 from Nalarac/Conductivity
Adds NOCONDUCT to Some Items
2019-08-08 12:07:10 -08:00
Mechoid c462448da8 Introduce the Distillery, a few recipes, and new chemicals. Introduce chemical patches, which apply on-touch chemicals, and can be dissolved a la pills. 2019-08-07 20:49:24 -07:00
Nalarac 88e79b30c5 Adds NOCONDUCT to Some Items 2019-08-07 09:46:39 -05:00
TheFurryFeline bbf0dac15e Freebie Orange Jumpsuit
Splits the orange jumpsuit into two objs. One for loadout and one for prison clothes. Closets updated to reflect changes. Follow-up of https://github.com/VOREStation/VOREStation/pull/5561 which has no effect here but will fix a bug that results from it.
2019-08-05 19:33:47 -04:00
Atermonera f2d72e64f6 Merge pull request #6295 from Mechoid/TTS_And_Sign
Adds an advanced TTS circuit, and sign-camera.
2019-08-05 14:51:00 -08:00
Atermonera cefac4ca30 Merge pull request #6357 from Michiyamenotehifunana/HanalSprites
Resprites Health Analyzers and Adds Scanning Animations
2019-08-04 13:20:02 -08:00
Anewbe bb4988e3e6 Merge pull request #6359 from Nalarac/patch-5
Updates Supermatter Guide Book
2019-08-02 13:05:36 -05:00
Atermonera 280747c2d6 Merge pull request #6354 from MagmaRam/eyestabs
Adds proper miss chance for stabbing people in the eyes.
2019-07-30 16:18:51 -08:00
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
Andrew 2a2dc777fb Updates Supermatter Guide Book
Gives a more detailed outline on starting the engine and corrects outdated content.
Gives step in ejection procedure to check engine room power.
Suggests adding more gas in  emergency cooling procedure.
Maintains that nitrogen is standard, but removes suggestions that phoron is harmful in the reactor loop.
Replaces "Air" with "Gas" as air suggests standard atmosphere.
2019-07-30 15:06:42 -05:00
Michiyamenotehifunana b29d8dfdf9 Resprites Health Analyzers and Adds Scanning Animations 2019-07-30 13:10:35 +08:00
MagmaRam 3f06a377fe Adds proper miss chance for stabbing people in the eyes. 2019-07-28 10:08:50 -05:00
Nalarac 5cda8072b7 Fixes Robots putting things in rechargers 2019-07-27 14:53:08 -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
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
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
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
atermonera 4774696de9 Lists supply units directly 2019-07-15 15:29:09 -08:00
Atermonera 887804ea10 Merge pull request #6245 from Ketrai/ROCKSDOJUSTROCK
The great rock update.
2019-07-13 14:21:19 -08:00
Atermonera f094e43fe1 Merge pull request #6272 from Mechoid/Mining_Expansion_The_Diggening
Mining Expansion, the Diggening.
2019-07-12 23:47:42 -08:00
Mechoid cb066512f6 Adds an advanced TTS circuit, and sign-camera. 2019-07-11 00:03:55 -07:00
Heroman a8715d8ed4 Proper way of making it work 2019-07-11 16:42:45 +10:00
Heroman 66ba1a5ccc Makes it work properly with non-mobs 2019-07-11 16:38:15 +10:00
Heroman 24f8780ad2 Makes airtight plastic flaps less of a free pass 2019-07-11 16:23:26 +10:00
atermonera 3f8f85aca4 fixes communicator weather app's air reading 2019-07-08 20:30:03 -08:00
Atermonera 2b0603faaa Merge pull request #6262 from Mechoid/CivilianExpansion1
Civilian Expansion 1: The Plantening
2019-07-07 13:29:08 -08:00
Mechoid 4d4b14a2a1 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into Mining_Expansion_The_Diggening 2019-07-06 21:19:03 -07:00
Mechoid 90f8ca9f0d Mining Expansion, the Diggening. 2019-07-06 21:18:31 -07:00
Ketrai 6cc36acccb makes ledges work, kinda. 2019-07-05 17:03:51 +02:00
Atermonera 438e113621 Merge pull request #6266 from Mechoid/StopSecurityFromBlowingTheirTops_Flashfix2
Flashes actually work as said on the tin.
2019-07-03 19:10:07 -08:00
Atermonera 1f4b96fab6 Merge pull request #6263 from Nalarac/patch-6
Nerfs Simple Doors
2019-07-03 19:07:38 -08:00
Anewbe 4e711c4399 Merge pull request #6259 from Heroman3003/flowerfix
Fixes ppflowers having no icon sometiems
2019-07-03 12:09:11 -05:00
Mechoid a01fb92313 Flashes actually work as said on the tin. 2019-07-02 23:42:08 -07:00
Andrew 4f8173e3b7 Fixes bullet_act to Proj.force 2019-07-02 21:28:37 -05:00