Commit Graph
963 Commits
Author SHA1 Message Date
Markolie 87570fc080 isNonCrewAntag() checks, key_name fixes 2015-08-20 17:25:55 +02:00
TheDZD 2248b3eaa6 Merge pull request #1760 from Markolie/ipcmasterrace
IPC overhaul
2015-08-19 11:57:04 -04:00
Fox-McCloud 43359d791d Merge pull request #1782 from Markolie/coffee
Coffee jitter fix, changeling revive fix
2015-08-18 20:19:11 -04:00
Markolie 8bede1db99 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into ipcmasterrace
Conflicts:
	code/modules/mob/living/simple_animal/friendly/fox.dm
	code/modules/organs/organ_alien.dm
2015-08-18 18:38:59 +02:00
Markolie c10b62959b Re-add IPC syringing 2015-08-18 18:36:05 +02:00
Markolie a41f15d17a Coffee fix, changeling revive fix 2015-08-18 18:33:58 +02:00
Krausus f816b8672d Resolves merge conflicts
Conflicts:
	code/game/machinery/computer/communications.dm
2015-08-18 04:14:14 -04:00
Krausus 2090a66023 Fixes various runtimes
- Fixes flashers runtiming when flashing someone who lacks eyes.
- Fixes chem masters runtiming when told to make 0 pills.
- Fixes job objective completion runtiming when someone without a PDA
completes a job objective.
- Fixes the HUDs of clientless robots runtiming when trying to update.
- Fixes T-ray scanners causing runtimes when objects they're making
visible get deleted.
- Fixes mech bay recharge station turfs runtiming if destroyed while
missing a recharging port/console.
2015-08-18 02:53:23 -04:00
Fox-McCloud e618f79418 Merge pull request #1768 from Markolie/diona
Turn diona nymphs into simple animals
2015-08-17 21:34:46 -04:00
Fox-McCloud 333e7fe236 Merge pull request #1766 from Markolie/adminbus
Admin jump overhaul, add watchlist functionality, other admin updates
2015-08-17 18:10:38 -04:00
Markolie 766b0c979f Turn dionas into simple animals 2015-08-17 02:19:29 +02:00
Markolie 5eee617063 Consolidate ?/FLW links under key_name_admin 2015-08-17 00:13:53 +02:00
Markolie a397c730b5 Admin jump overhaul, add watchlist functionality, other admin updates 2015-08-16 23:28:02 +02:00
Markolie 4a14a97b3b IPC overhaul part deux 2015-08-16 02:34:52 +02:00
Markolie e6408b96c2 IPC overhaul 2015-08-15 23:52:26 +02:00
Markolie 8330a5cea9 Add option to request nuke code to consoles (from /tg/) 2015-08-14 20:43:20 +02:00
Markolie 839f6656dc Fix chemmaster menu not closing 2015-08-14 20:19:27 +02:00
Markolie 72380b2aad Update ID code in communications computer, make chem dispensers/chem masters accessible to ghosts 2015-08-14 20:10:41 +02:00
Fox-McCloud 427a4437e8 Merge pull request #1713 from Markolie/master
Fixes
2015-08-12 17:37:22 -04:00
Mark van Alphen bc5f7ccb0c Merge pull request #1706 from Alex6511/master
Makes lethal injection syringes far more deadly
2015-08-12 18:24:46 +02:00
Markolie 362a817d79 Runtime and bug fixes 2015-08-12 18:20:53 +02:00
Alex6511 b19d15b9cb Adjusted the drugs more. 2015-08-10 23:33:22 -04:00
Alex6511 f704e200b7 Update syringes.dm 2015-08-10 23:00:50 -04:00
Alex6511 5f5167ccfa Makes lethal injection syringes more deadly 2015-08-10 22:58:43 -04:00
Fox-McCloud 0d810b5012 typo 2015-08-10 12:18:00 -04:00
Fox-McCloud 7ac65025bd Adds Pistachio Snacks 2015-08-10 01:56:50 -04:00
Fox-McCloud f5784b72a2 Chemistry Tweaks 2015-08-08 19:59:31 -04:00
Fox-McCloud 82f62da60f Merge pull request #1604 from TheDZD/helper
Subtypesof Helper Proc
2015-08-03 17:44:01 -04:00
DZD d9bb30f47a Replaces typesof with subtypesof where applicable 2015-08-03 11:04:28 -04:00
Markolie aca3a2cecb Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into powernet
Conflicts:
	_maps/map_files/cyberiad/cyberiad.dmm
	code/game/machinery/alarm.dm
	code/modules/power/smes.dm
2015-08-01 21:44:47 +02:00
Markolie 2c1d0ea7d4 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into cloner
Conflicts:
	_maps/map_files/cyberiad/cyberiad.dmm
2015-08-01 19:41:11 +02:00
Markolie dd067f582a Update smartfridge types, merge branch 'master' of https://github.com/ParadiseSS13/Paradise into powernet
Conflicts:
	_maps/map_files/cyberiad/cyberiad.dmm
2015-08-01 19:35:39 +02:00
Markolie 08f67c7881 Smartfridge update 2015-08-01 00:18:00 +02:00
Fox-McCloud 30f5465d47 Merge pull request #1593 from FalseIncarnate/master
Candy Fixes, Juicer Fix
2015-07-31 12:58:14 -04:00
FalseIncarnate 9d13429769 Candy Fixes, Juicer Fix
Fixes a number of New() procs for candies that would runtime
- Issue was caused by incorrect arguments for the add_reagent proc

Fixes gummy worms being incorrectly named gummy bears

Fixes the candy cane recipe resulting in a mint rather than a candy cane

Re-paths recipes for flavored candies to not be subtypes of the plain
version to fix the generation of candy moulds from recipes that don't
require the mould.
- Also applied this to candybars so the recipe path better communicates
the end-result

Updates the recipes for the WTF (druggy) gummy bears and worms to work
with the botany update ambrosia
- Previously checked for the hardcoded path rather than the kitchen_tag
which the rest of the kitchen was updated to use

Fixes the juicer failing to juice watermelon slices
2015-07-30 19:01:43 -04:00
Markolie f939800c68 Update upgradable machinery New code 2015-07-30 22:19:32 +02:00
Fox-McCloud 1ee7853d65 Merge pull request #1476 from TheDZD/mining2
Mining Overhaul [Soon™]
2015-07-29 20:51:24 -04:00
FalseIncarnate ad9ad7fc40 Kitchen Overhaul 2: Table Edition
Moves a number of kitchen recipes to utilize table-crafting!
- Instead of dumping the ingredients in the microwave, simply collect
them on the table to assemble your dish via the table-crafting menu
- The option to assemble the dish will only appear if all the
ingredients are present on the SAME table section.

Table-crafted foods:
- Sandwich
- Slime Jelly Sandwich
- Cherry Jelly Sandwich
- Slime Jelly Burger
- Cherry Jelly Burger
- Not-a-sandwich
- Egg Wrap
- Herb Salad
- Aesir Salad
- Valid Salad
- Ingredients are unchanged

Standardizes the chef's knife usage!
- Now the chef can use the Cutlet knife (knife utensil), kitchen knife,
butcher knife, or scalpel to cut meat into cutlets!
- Now the Cutlet Knife (knife utensil) can be properly used to slice
cakes, pizza, bread, flat dough, and so forth instead of scooping up a
bit onto the knife.
- If a food object cannot be sliced (no slice_path defined), it will
scoop up a bit as before. Forks, spoons, and plastic knives will always
scoop, regardless of slice_path.

Fixes the Toasted Sandwich microwave recipe not working.
- It was missing a result, meaning it was not being loaded as an
acceptable recipe and causing the microwave to reject sandwiches.

BACKEND CODER CRAP:
- Tablecrafting recipes now can support botany produce and adjusting
chems in the result item.
- New fruit list var is used for botany produce
- New AdjustChems proc is used to handle final chem adjustments, such as
removing or adding chems from the finished product.
2015-07-25 06:38:09 -04:00
DZD 66688f4dbb Fixes conflicts in icons/obj/gun.dmi. 2015-07-24 15:29:20 -04:00
SamCroswell d84dfe5a49 ERT Rework - Code Changes 2015-07-20 19:37:56 -04:00
Fox-McCloud 04511d3f0b Blob Mode Major Overhaul 2015-07-12 02:45:40 -04:00
DZD 412443dbf1 Fix non-icon merge conflicts 2015-07-10 19:57:59 -04:00
TheDZD 13f01232c9 Merge pull request #1480 from Fox-McCloud/qdel-the-dels
The Great Del() Cull of 2015
2015-07-09 22:37:43 -04:00
Fox-McCloud 54f59b9899 Pass II 2015-07-09 19:51:40 -04:00
DZD 916f9bf4bb Sort of compiles
Time to fix xenoarch, and then the map.
2015-07-09 15:55:36 -04:00
Fox-McCloud db17187584 Merge pull request #1474 from FalseIncarnate/cold_reagents
Cold Reactions and Applejack
2015-07-09 05:56:42 -04:00
FalseIncarnate 5255d652f0 Freezing is silent
Ice and Applejack are now reactions without sound.
2015-07-09 05:49:56 -04:00
Fox-McCloud 0dbea7621f The Great Del() Cull of 2015 2015-07-09 02:48:34 -04:00
FalseIncarnate fa4fa1237e Cold Reactions and Applejack
Adds the ability to make a chemical reaction only occur when at or below
a specified temperature.

Adds new reaction for freezing water into ice
- Must be at or below 270K to turn water to ice

Adds two new reagents/drinks: Applejack and Jack Rose cocktail
-Applejack is obtained by freezing cider at or below 270K
- Applejack is slightly more potent than cider, due to it's alcohol
concentration being higher
- Jack Rose is a new mixed drink that is 4 parts Applejack, 1 part Lemon
Juice

Only Ice and Applejack utilize the cold reactions at this time, but the
functionality is in place for future reactions.
- This should allow coders more flexibility with defining new reactions
that may realistically occur at low temperatures.

Renamed the existing "required_temp" variable for reactions to
"min_temp" to better communicate it's purpose and differentiate it from
the new "max_temp" variable for cold reactions.
2015-07-08 04:34:25 -04:00
Fox-McCloud 0e8619a202 Destroy Pass III 2015-07-08 03:39:52 -04:00