Commit Graph

1867 Commits

Author SHA1 Message Date
Arokha Sieyes
5d54787198 Fix a runtime with snacks 2018-02-28 15:57:07 -05:00
Aronai Sieyes
3ef3275d59 Merge pull request #3139 from VOREStation/Cameron653-patch-2
Promethean Water Edits
2018-02-27 21:50:38 -05:00
Aronai Sieyes
2935ec1ac8 Merge pull request #3149 from VOREStation/aro-sync
Polaris Sync
2018-02-27 21:48:52 -05:00
Arokha Sieyes
3fe17274d2 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync
# Conflicts:
#	code/ATMOSPHERICS/pipes.dm
#	code/game/turfs/flooring/flooring.dm
#	code/modules/clothing/clothing_accessories.dm
#	code/modules/mob/living/carbon/human/inventory.dm
#	html/changelogs/.all_changelog.yml
2018-02-27 21:27:35 -05:00
Belsima
d8b0685d25 Discourages eating monkey cubes 2018-02-27 18:19:05 -05:00
Arokha Sieyes
f04c58f202 VS: Rewrites basically all of how bellies work
And cleans up a ton of stuff.
2018-02-27 13:29:45 -05:00
Atermonera
519754c2e8 Merge pull request #4959 from Screemonster/itsmostlywater
Makes drinking bleach bad for you
2018-02-26 12:16:13 -08:00
Cameron653
756f42ffd5 Whoops, messed up comment formatting 2018-02-25 17:01:49 -05:00
Cameron653
cc7b722443 Update Chemistry-Reagents-Core.dm 2018-02-25 16:54:17 -05:00
Screemonster
b8b173b044 Makes drinking bleach bad for you 2018-02-25 18:51:18 +00:00
Cameron653
8dfc88f494 Makes water not kill slimes.
Resolves #3136
2018-02-25 12:50:42 -05:00
Anewbe
387f977f45 Copy paste is bad, kids 2018-02-25 02:44:32 -06:00
Leshana
4ebbf1ce7a Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-24
# Conflicts:
#	maps/southern_cross/southern_cross-1.dmm
2018-02-24 13:19:10 -05:00
Schnayy
8ccf0f7532 AlliCo Hallmark Goods (#4887)
* Adds the gift vendor, AlliCo Hallmark Goods, ran the name by Elgeon beforehand. Is a delightfully gaudy vending machine placed in the locker rooms. The coffee machine was removed and the sweatmax moved to take it's place so the gift vendor is next to the laptop and cigarette vendors. Prices were based off of the SweatMax vendor.

Before: https://i.gyazo.com/0d6758fc8a469fea6e340b5937b95f82.png
After: https://i.gyazo.com/ab21b6ff7ed012786d475b71f1ec180e.png

Vendor will normally dispense:
- Heart box chocolates
- Bouquets
- Cheaper fake bouquets
- Each of the 4 cards previously added.
- All the therapy dolls.

Will dispense the following with a coin:
- All small plushies
- Newly added trinket box.

Will dispense the following when hacked:
- Gilthari Luxury Champagne
- Plans to add a handbuzzer in the future but not right now.

Items & Reagents added:

- Champagne. Is not a mixable reagent, listed as a child of wine.
- Gilthari Luxury Champagne. Contains said reagent.
- Trinket box. Think an engagement ring box, except it can also hold coins and medals. May be toggled open/closed, when opened it's description will say what's inside. Can only hold one item. Thanks to Mechoid for helping me code this mess. https://i.gyazo.com/7a16faada015ef0795a4db2ec6429e68.png
- Also goes in and fixes a small bug with the heart box saying it contains donuts when it does, in fact, not contain donuts.

Side note, mapping things in is scary!!!

* In the process of fixing the map merger nonsense w/ mechoid's help.

* We're almost there lads.

* If this doesn't work I'll cry.

* Changes name to AlliCo Baubles and Confectioneries, fixes conflict (hopefully), and adds friendship bracelets to vendor.

* REVERTING ITEMS.DMI. Attempting to fix conflict.

* Recommitting items.dmi

* One last attempt to fix the conflict before I make some bigger changes to get this through.

* Removed conflicting file and committed out calls on the sprite. Will readd in separate PR.

* now with 20% less silly
2018-02-24 11:01:23 -06:00
Leshana
30454ccdc3 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-23
# Conflicts:
#	code/game/jobs/job_controller.dm
#	code/game/machinery/oxygen_pump.dm
#	code/game/objects/items/weapons/storage/firstaid.dm
#	code/game/objects/structures/crates_lockers/closets/secure/security.dm
#	code/modules/mob/new_player/new_player.dm
#	code/modules/organs/internal/eyes.dm
#	html/changelogs/.all_changelog.yml
#	maps/southern_cross/southern_cross-1.dmm
#	vorestation.dme
2018-02-23 21:55:42 -05:00
Screemonster
67c8d706dc more sanity checks and sensible syntax 2018-02-20 23:22:04 +00:00
Mechoid
39e737f2a3 Merge pull request #4846 from Anewbe/wetslime.nt
Prometheans are bothered by water
2018-02-19 20:28:26 -08:00
Screemonster
635bbb7a73 Adds "monster tamer". 2018-02-19 14:03:34 +00:00
Arokha Sieyes
5967bb6dc5 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync
# Conflicts:
#	code/game/objects/items/weapons/storage/boxes.dm
#	code/game/objects/items/weapons/storage/storage.dm
#	code/modules/mob/living/carbon/human/species/species.dm
#	html/changelogs/.all_changelog.yml
#	maps/southern_cross/southern_cross-6.dmm
2018-02-18 00:25:36 -06:00
Anewbe
329a65be08 Merge pull request #4838 from VOREStation/pol-emerboxes
Port Bay's survival boxes
2018-02-17 10:05:39 -06:00
Leshana
7ed3d2c2f6 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-16
# Conflicts:
#	code/_onclick/hud/screen_objects.dm
#	code/game/objects/items/weapons/storage/storage.dm
#	code/game/objects/structures/crates_lockers/closets/secure/medical.dm
#	code/modules/admin/admin_verbs.dm
#	code/modules/clothing/clothing.dm
#	code/modules/clothing/gloves/color.dm
#	code/modules/lore_codex/codex.dm
#	code/modules/mob/living/simple_animal/aliens/alien.dm
#	code/modules/mob/living/simple_animal/animals/cat.dm
#	code/modules/mob/living/simple_animal/animals/goose.dm
#	code/modules/mob/living/simple_animal/simple_animal.dm
#	code/modules/mob/mob_defines.dm
#	code/modules/projectiles/projectile/special.dm
#	html/changelogs/.all_changelog.yml
#	maps/southern_cross/southern_cross-1.dmm
#	maps/southern_cross/southern_cross-7.dmm
#	vorestation.dme
2018-02-17 00:35:29 -05:00
Arokha Sieyes
f4d0ec3fb8 Port Bay's survival boxes
Includes some tweaks to items that usually come in the boxes to make them more similar to the Bay implementation.
2018-02-16 19:21:15 -06:00
Anewbe
ab9f296adb Merge pull request #4837 from Schnayy/giftitems
Gift items + Cargo crate
2018-02-16 12:52:59 -06:00
Anewbe
b7711fa490 Prometheans are bothered by water 2018-02-15 19:11:54 -06:00
Schnayy
02447e5c19 The largest PR I've probably actually done. Adds the following:
* Bouquets
* Fake Bouquets. Can be won from arcade machines.
* Heart box chocolates containing a set arrangement of chocolates.
* Adds said chocolates (milk chocolate, white chocolate, and truffles) all bite-sized.
* Adds 5 cards, one blank and four with covers. Function identical to paper except you can't make an airplane because I hate fun.
* Adds The four cards with covers, 3 real bouquets, and 2 chocolate boxes to cargo under a 'gift crate' for 10 points.

Sprites by me. Code would not be possible without cerebul's help. Let me know if I've goofed on something, but I did test all of the items + ordering them from cargo.
2018-02-15 03:33:23 -06:00
Arokha Sieyes
4a6a6d5742 Prevent infinite deuterium 2018-02-15 02:34:42 -06:00
Anewbe
b84878a5b7 Merge pull request #4806 from Cerebulon/meatbreadfix
Fixes Metaphysical Meatbread
2018-02-12 14:17:50 -06:00
PrismaticGynoid
188856be10 Makes More Machines Movable (#4801)
* Makes More Machines Movable

Adds in the ability to wrench/unwrench a number of machines that previously could not be. Now you're able to move:
Laptop venders!
Seed extractors!
Biogenerators!
Drying racks!
Microwaves!
Cooking machines!
Gibbers!
Chemmasters/Condimasters!
Bioprinters!
Virology machines!
Washing machines!
Tested with no apparent problems.

* Knew I forgot something
2018-02-12 14:01:14 -06:00
Cerebulon
521b77ae45 Fixes metaphysical meatbread 2018-02-12 06:33:26 +00:00
Leshana
1d0f5262d8 Merge remote-tracking branch 'upstream-polaris/master' into polaris-sync-2018-02-07
# Conflicts:
#	code/__defines/subsystems.dm
#	code/controllers/master_controller.dm
#	code/controllers/subsystems/atoms.dm
#	code/game/machinery/Sleeper.dm
#	code/game/machinery/doors/airlock.dm
#	code/game/machinery/vr_console.dm
#	code/game/objects/items/devices/communicator/phone.dm
#	code/game/turfs/flooring/flooring_decals.dm
#	code/modules/admin/admin_verbs.dm
#	code/modules/mob/living/carbon/carbon.dm
#	code/modules/multiz/movement.dm
#	code/modules/projectiles/gun.dm
#	code/modules/shuttles/shuttle.dm
#	code/modules/shuttles/shuttles_web.dm
#	icons/obj/doors/doormed.dmi
#	maps/southern_cross/items/headset_sc.dm
#	maps/southern_cross/southern_cross-3.dmm
#	vorestation.dme
2018-02-07 19:30:50 -05:00
atermonera
05fe601430 Ethylredox removes alcohol 2018-02-07 13:17:00 -08:00
Anewbe
e565108ce7 Hyposprays and autoinjectors have a delay when used on a target that is not in help intent 2018-02-06 13:35:30 -06:00
Ketrai
030aff7c87 TYPO 2018-02-04 18:43:17 +01:00
Ketrai
4c26688e2c makes vermicetol more potent.
Seeing as I disregarded the effect of metabolism, vermicetol was unintentionally weak. So incredibly slow that the effect was barely noticable.

The potency now should cause vermicetol to heal at a rate of 2.2. which is roughly 63% lower than ketolade, but lasts a whole lot longer.
2018-02-04 18:24:51 +01:00
Leshana
4f98fad36b Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-01
# Conflicts:
#	.travis.yml
#	code/_away_mission_tests.dm
#	code/modules/admin/verbs/mapping.dm
#	code/modules/mob/living/carbon/human/update_icons.dm
#	html/changelogs/.all_changelog.yml
#	maps/southern_cross/southern_cross-1.dmm
#	maps/southern_cross/southern_cross-3.dmm
#	maps/southern_cross/southern_cross-6.dmm
#	nano/images/nanomap_z1.png
#	nano/images/nanomap_z10.png
#	nano/images/nanomap_z2.png
#	nano/images/nanomap_z3.png
#	nano/images/nanomap_z5.png
#	nano/images/nanomap_z6.png
2018-02-01 23:55:47 -05:00
SunnyDaise
d508af3285 Fixes:
Onion Rings are no longer named Onion Soup
2018-01-30 16:02:13 +00:00
Cyantime
154eea2a95 Fixes potato sticks 2018-01-28 23:41:00 -05:00
Cyantime
173a196212 Removes duplicate rezadone definition (#4660) 2018-01-28 18:12:32 -08:00
Leshana
27c3272821 Merge remote-tracking branch 'upstream-polaris/master' into polaris-sync-2018-01-27
# Conflicts:
#	code/ZAS/_docs.dm
#	code/__defines/mobs.dm
#	code/game/turfs/flooring/flooring_decals.dm
#	code/game/turfs/simulated/walls.dm
#	code/modules/client/preference_setup/loadout/loadout_utility.dm
#	code/modules/lore_codex/codex.dm
#	code/modules/mob/living/life.dm
#	code/modules/mob/living/living_defines.dm
#	maps/southern_cross/southern_cross-1.dmm
#	maps/southern_cross/southern_cross-3.dmm
#	maps/southern_cross/southern_cross-6.dmm
#	maps/southern_cross/southern_cross-7.dmm
#	maps/southern_cross/southern_cross_jobs.dm
#	vorestation.dme
2018-01-27 23:08:53 -05:00
SunnyDaise
1f80c3336d Onions, Food and Plant Tweaks (#4629)
* Onyonyon

* Fixes Potato's and adds Changelog.
2018-01-27 16:53:54 -08:00
Cyantime
3b71498ddc Fixes potato reagentID (#4637)
* Vodka can be produced again
2018-01-27 16:52:40 -08:00
Cerebulon
8ec8b89e10 Adds a bunch of food recipes from /tg/station. (#4565)
* Adds a bunch of food from /tg/station.
With recipes adjusted for our system.
Meat Bun, Sashimi, Eggs Benedict, Baked Beans, Sugar Cookie, Berry Muffin, Booberry Muffin, Egg Roll, Fruit Salad, Egg Bowl, Pork Bowl, Tortilla, Meat Burrito, Cheese Burrito, Fuego Burrito, Nachos, Cheesy Nachos, Cuban Nachos, Pig in Blanket.
2018-01-23 19:16:30 -08:00
PrismaticGynoid
6f8559de07 Makes berry milkshakes makeable
Critical bugfix: uncapitalizes a letter which was preventing berry milkshakes from being made.
2018-01-22 20:33:53 -08:00
Arokha Sieyes
9016ca94c0 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync01222018
# Conflicts:
#	code/modules/mob/mob.dm - Whitespace? No real conflict.
#	code/modules/mob/mob_planes.dm - Comment conflict, was a late port to Polaris.
2018-01-22 12:10:19 -05:00
SunnyDaise
10490fa5b4 Food and Drink: Additions and Bugfixes (#4598)
* Food and Drink
2018-01-21 22:18:33 -08:00
Leshana
805897eafb Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-01-20 2018-01-21 00:23:00 -05:00
Atermonera
17accf2e28 Band-aids three runtimes (#4591)
* Runtime in dna_modifier.dm,330: Cannot read null.occupant

* Runtime in Chemistry-Reagents.dm,47: Cannot execute null.remove reagent().

* Runtime in blood.dm,182: Division by zero

* Compiled with the right map this time
2018-01-20 13:28:51 -06:00
Cyantime
84c3154b2b Merge branch 'master' into hypo 2018-01-20 01:39:16 -05:00
Cerebulon
a5de13cdb9 Fixes duplicate tea recipe.
Also a bunch of extremely minor drink typos.
2018-01-20 01:53:50 +00:00
Leshana
436d48b337 Update VOREStation specific code to use merged in features.
* Update our reagent_containers to use the new "prefill" feature instead of our own PolarisSS13/Polaris/pull/4583
* Fix missing VOREStation Edit comments.
* Prevent singularity from entering dorm areas.
2018-01-19 18:15:47 -05:00