Commit Graph

104 Commits

Author SHA1 Message Date
SteelSlayer
7088de6bab slippery component 2020-06-06 15:35:12 -05:00
Deckard Cain
f97bc5876b fixed apples not distilling in fermenting barrels
apples previously distilled into hcider, which was an icon state and not actually a reagent proper. this resulted in apples simply not fermenting into anything when processed in a fermenting barrel. (if the apples contained reagents such as plant_matter or sugar or whatever else botanists put in their genes, then these would of course be transferred to the barrel normally.)
2020-05-14 16:53:41 -04:00
AffectedArc07
ded391b325 Bonfire Logs (#13268)
* Bonfire Logs

* Farie Suggestion

* Adds craft logging

* Log changes
2020-04-11 15:47:45 -06:00
AffectedArc07
210f8badf4 Makes all global variables handled by the GLOB controller (#13152)
* Handlers converted, now to fix 3532 compile errors

* 3532 compile fixes later, got runtimes on startup

* Well the server loads now atleast

* Take 2

* Oops
2020-03-20 21:56:37 -06:00
AffectedArc07
04ba5c1cc9 File standardisation (#13131)
* Adds the check components

* Adds in trailing newlines

* Converts all CRLF to LF

* Post merge EOF

* Post merge line endings

* Final commit
2020-03-17 18:08:51 -04:00
variableundefined
edebec5194 Merge pull request #13021 from Fox-McCloud/add-cbd
Adds CBD
2020-03-08 21:46:20 -04:00
variableundefined
5f6e9f8cb2 Merge pull request #13007 from TheSardele/log-change
Adds a log for admins
2020-03-08 03:43:52 -04:00
Mitchs98
d04c11eb60 Le Bomba (#13052) 2020-03-01 13:18:01 -07:00
Fox McCloud
c55ce4aab3 Adds CBD 2020-02-23 19:46:29 -05:00
TheSardele
7af1b2ae1e Use helpers 2020-02-20 11:42:59 +01:00
TheSardele
3635b42335 Adds a log 2020-02-19 23:58:46 +01:00
Fox McCloud
20c4cf0a08 for-if-I-stand-I-stand-by-his-will-alone 2019-10-03 19:52:03 -04:00
Fox McCloud
a469d0fcf2 for-God-has-redeemed-us-all 2019-09-30 16:49:15 -04:00
AzuleUtama
2855248818 Fixes durathread mutating, reorganizes seed vendor (#12401) 2019-09-24 15:19:45 -07:00
Fox McCloud
c87389a595 TG Buckle Update (#12375) 2019-09-22 18:22:57 -07:00
MarsM0nd
7c2abe9cdf Fixes nettle pickup (#12371) 2019-09-21 12:18:36 -07:00
Fox McCloud
d5759a0db5 Rebalances Golems, Refactors Species Based Equipping (#12358) 2019-09-21 06:10:37 -07:00
Fox McCloud
91d08fb1f6 garlic reagent 2019-09-11 06:33:03 -04:00
Fox McCloud
5e4521bc82 Hydroponics Update: Growable Ash Flora 2019-09-11 05:52:57 -04:00
variableundefined
a5c0138dda Deconflict and revert an accidental iconstate name change 2019-08-31 09:18:36 -04:00
Fox McCloud
9f2f9cfa6c Merge remote-tracking branch 'upstream/master' into ports-tailoring 2019-08-27 18:23:11 -04:00
variableundefined
83751e8e74 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into TasteOfVictory 2019-08-27 15:20:23 -04:00
Fox McCloud
eef0bc919d Implements Tailoring 2019-08-26 17:41:39 -04:00
Fox McCloud
0189cd1dee Diona Rework 2019-08-12 01:51:29 -04:00
variableundefined
d3f6886433 Hydroponic, food and reagent taste mult 2019-08-05 00:08:49 +08:00
variableundefined
f4c8678892 Hydroponic Stage 1 2019-08-04 10:37:18 +08:00
Mark van Alphen
fd579015b1 Portal fixes - adds oldloc to Crossed() 2019-07-15 20:16:17 +02:00
Mark van Alphen
4423962a2a Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
# Conflicts:
#	code/controllers/subsystem/mapping.dm
#	paradise.dme
2019-04-26 23:07:57 +02:00
Fox McCloud
0034e851a1 Kills off Object and Fast Object Processes 2019-04-23 23:53:40 -04:00
Mark van Alphen
a21ec0f30b Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
# Conflicts:
#	code/modules/mob/living/simple_animal/hostile/hostile.dm
2019-04-04 22:04:55 +02:00
joep van der velden
bba407c889 fixed deathnettle 2019-04-02 20:16:46 +02:00
Mark van Alphen
bf68f966b1 Add Ash Walkers, work on Syndicate base 2019-03-31 04:33:39 +02:00
Fox McCloud
814e492a55 Suicide Refactor 2019-03-27 22:54:26 -04:00
variableundefined
4ca33bb19d Merge pull request #11078 from Fox-McCloud/goonchem-reagent-temperature
[Goonchem] Reagent Temperature and Pyrotechnics
2019-03-24 17:50:07 +08:00
Fox McCloud
277722508a [Goonchem] Reagent Temperature 2019-03-18 20:06:15 -04:00
joep van der velden
e83a7131cc Refactored pickup code and fixed the bug 2019-03-18 16:42:44 +01:00
Mike Long
29c9aca1a8 Devil game mode
Fixes more compile errors.  Down to 65 now.

updates << into to_chat

Down to 60 errors, also starts to port the codex gigas and law 666 for cyborg devils.

Fixes more compile errors.  Down to 41 now.

Replaces timers with spawns, and <<s with to_chats
40 compile errors.

Down to 34 compile errors.

whoops, actually down to 34 now.

Down to 25 compile errors.

Down to 15 compile errors, I'llprobably need some help at this point.

Woo!  Down to 7 compile errors.

Ported over devil hud.  Number of errors up to 19.

WOO!  It compiles.  It's completely untested, but it compiles.

Adds devils to traitor panel

Implements iron, silver and salt banes.

implements flashing lights bane

Selling your soul prevents cloning, and some other methods of revival.

Implements harvest bane

Merged and sorted icons/obj/bureaucracy.dmi

Adds toy codex gigas

Fixes compile errors, adds codex gigas sprite.

Lots of bug fixes.  Contracts work, devil revival is more consistant, etc

Adds missing icons for flaming contracts, summon pitchfork, summon wealth, employment cabinet, and sintouch.

Converts DEEP LORE explanations from hell to inferno incorporated.

Banishes the compile errors.

Devils come from hell again.

replaces offer drink obligation with a much more lore appropriate devil's fiddle reference
Also fixes contract bashing brain damage chance.

Undoes some changes I accidentally did to example config files.

Fixes up a few remaining bugs.

Puts in the codex gigas and employment contract cabinets.
 -- Lemon - I kinda skipped this one, I'll patch it back in later because
 map conflicts are suffering incarnate

Solves the devil law problem in a REALLY hacky snowflake way.

Fixes a few methods in which a hellbound can be revived.

Devils respawn with a limited number of appropriate items, instead of COMPLETELY naked upon corpse destruction.  Also adds lines to example config.

Updates devil laws to be less hacky.

Objective to sintouch x mortals now greentexts correctly.

Contracts no longer cause brain damage.  I didn't realize it was lethal on this codebase.  Oops.

Splits dust(visual_only) into dust() and dust_animation() procs

Fixes some defines.
Adds undef statements to improve compile times.

Fixes race changes from demonic form changes.

Fixes small runtime error. (Which somehow didn't break anything?)

Implements lots of small changes/corrections suggested by CrazyLemon64

I still need to test these changes, along with other potential issues he brought up.

Fixes harvest bane and power contracts.  Also adds a few </span> tag enders.

Corrects some edge cases with revival contracts.

Fixes compile error.

Reverts unneccecary change to item/weapon/reagent_containers

Cleans up the code for readability.

Prevents cloning of hellbound individuals.

Latejoins now properly have employment contracts added to employment cabinets (provided they still exist)

Infernal contracts are no longer rendered unreadable by fire and alcohol.

All fireproof paper remains readable after being fireballed, not just infernal contracts.  (Though infernal contracts are the only fireproof paper atm)

Fixes an edge case problem with cloning.

Adds is_revivable proc to mind.

Removes snowflake code involving preventing soulseller resurrection.

Indulges in the sin of sloth, and copies tg's lazy list macros

Proc calls that transform the user no longer go to a null target

Fixes devil UI, human regression will keep appearance, and adds danceoff

Devil's base forms no longer suffocate inside the devil

Fixes runtimes, gets stuff working

The arch devil can now blast down walls with their pitchfork

EXTERMINATE ALL SPIRITS

Activates devil clause in voice of god

Fawks Mcclood

Feature P A R I T Y

Fixes devil bugs from testing

- Does a death refactor to make sure that diabolical resurrection works

- Walls no longer leave girders when blasted by the devil

- Getting a new body gives you a rudimentary amount of equipment to work
with to get out of maintenance or whereever

Does all the icons in a single commit on their own because icon

conflicts suck

Starting point of extra devil rebalance/fixes

Ports devil friends

Also oops tramples all over Fethas' corpse PR that's still up I need
to take care of that one

Styling fixes
2019-01-13 12:00:49 +01:00
Kyep
46acb9338b sunglasses, seeds, KA, IMS, fleshy 2018-12-22 14:16:25 +00:00
variableundefined
c2f92bec5e Make fermentation barrel a stack recipe, fixes koibean and soybean being OP 2018-11-03 21:39:38 +08:00
variableundefined
7428362d2f Fixes typo 2018-11-03 20:30:52 +08:00
variableundefined
7905b64076 Port over fermentation barrel, minor refactor of reagent container, add in wine power etc. 2018-11-01 11:01:45 +08:00
Jountax
eb182aa1fb Update chili.dm 2018-10-29 16:12:28 -04:00
Jountax
2e2af221fa Update chili.dm 2018-10-29 15:31:23 -04:00
Desolate
91ae4713b8 removes mushroom changes 2018-10-20 16:34:24 -05:00
Purpose
d392e6895a welp 2018-10-19 10:25:25 +01:00
Mars
984339ce42 Merge-conflict fix + check for null rather than type. 2018-10-12 18:59:54 +02:00
Mars
d9b60a7bfb Fix merge conflict 2018-10-09 09:41:37 +02:00
Desolate
c974e29a3c global lists global defined 2018-10-02 15:52:46 -05:00
Desolate
7d78fe93bf Refactors some reagent lists into global list
Fixes an oversight with fly amanita from the BAYBOTANY to TGBOTANY change.
2018-09-27 20:44:25 -05:00
Desolate
27ab332e4b added soybeanoil to soybeans, juice now for soymilk 2018-09-12 17:21:03 -05:00