cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-25 17:42:47 +00:00
Code Issues Packages Projects Releases Wiki Activity
41,682 Commits 9 Branches 0 Tags
421aa33c40e8e5a6075fde9e7c84cfd6e7ab9195
Commit Graph

1649 Commits

Author SHA1 Message Date
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
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
Leshana
3c3dac7102 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-01-19 
# Conflicts:
#	code/_onclick/hud/hud.dm
#	code/modules/clothing/glasses/glasses.dm
#	code/modules/mob/living/carbon/human/update_icons.dm
#	maps/southern_cross/southern_cross-1.dmm
#	maps/southern_cross/southern_cross-3.dmm
#	maps/southern_cross/southern_cross-6.dmm
#	vorestation.dme
 2018-01-19 17:52:25 -05:00
Cyantime
8255744c2b Allows easier prefilling of beakers, bottles, etc (#4583) 
* Allows easier prefilling of beakers, bottles, etc

* Optimization
 2018-01-19 15:38:46 -06:00
Cyantime
09eb4054a5 Removes hypospray/vr and vial/vr 2018-01-18 19:01:26 -05:00
Cyantime
37f65b2654 /glass reagent container prefilling 2018-01-18 18:50:34 -05:00
Arokha Sieyes
d6c42739f6 POLARIS: Remove the ability to powergame with tiny amounts of certain reactions 2018-01-18 18:12:57 -05:00
Cyantime
cf1cf1e602 Changes vial max transfer amount to 30 2018-01-18 17:22:40 -05:00
Anewbe
b6bc743a95 Merge pull request #4563 from SunnyDaise/Icons-and-Small-Code 
Adds Apple Juice.
 2018-01-17 19:29:57 -06:00
Arokha Sieyes
ff228754b3 Merge polaris sync 01 17 2018 
Planes, layers, human/update_icon()
 2018-01-17 17:56:51 -05:00
Neerti
5b54f4c875 Surface Map Work (#4557) 
* Tweaks Surface, POI system

* More Stuff

* Travis Appeasement

* Fixes invisible banner.
 2018-01-17 13:46:19 -06:00
SunnyDaise
a0bd8f6915 Adds Apple Juice. 2018-01-17 07:29:40 +00:00
Leshana
5d5f052eb7 Merge remote-tracking branch 'polaris-upstream/master' commit '613c5984eeeed2757fe7f15877973f81f526323c' into polaris-sync-2018-01-10 
# Conflicts:
#	code/game/machinery/atmoalter/area_atmos_computer.dm
 2018-01-15 13:27:39 -05:00
Arokha Sieyes
9a56c27c9f Merge pull request #2711 from VOREStation/aro-nifrep 
Advanced NIF Repair Tool
 2018-01-14 00:58:18 -05:00
Mechoid
ff02218ccb Hatchets - > Machete subtype. 2018-01-12 21:21:18 -08:00
Mechoid
5efc484595 Makes knives all knives. 2018-01-12 18:02:07 -08:00
Cyantime
ddf485273a vegitables 2018-01-11 22:37:23 -05:00
Leshana
807f1c7b4b Merge remote-tracking branch 'polaris-upstream/master' into polaris-sync-2018-01-09 
# Conflicts:
#	code/game/objects/items/devices/communicator/UI.dm
#	code/game/objects/structures/flora.dm
#
 2018-01-09 14:40:09 -05:00
Arokha Sieyes
ea6ecca731 Advanced NIF Repair Tool 
Creatable at the protolathe. Requires the same tech levels as the NIF, but no exotic materials.

It's a device that accepts nanopaste, and programs the nanite swarms into NIF repair swarms, which are a liquid reagent ingame. It has a 60u storage capacity, and needs to be emptied into any container.
From there, it can be injected via syringe, made into pills, or drank (though the latter two reduce effectiveness by 50%). Each unit nanopaste makes 15u repair nanites, so a full repair from 0% to 100% of a normal NIF requires 7 nanopaste converted to reagents (100u).
 2018-01-08 17:14:56 -05:00
Cyantime
36f8c56537 Fixes 'varient' 2018-01-08 16:42:20 -05:00