Commit Graph

77 Commits

Author SHA1 Message Date
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
Mars
b5b09b435c No hard-coded format in the macros anymore 2018-08-16 11:51:52 +02:00
Mars
e8d92b3ced More flexible macro 2018-08-16 11:37:03 +02:00
Mars
4d3c3b29e4 Quick Regex replace action
Used Regex to replace all hrefs with \ref and the same displayed text
with the corresponding UID macros
2018-08-15 23:57:46 +02:00
Tayyyyyyy
919bd7aaf2 Replace \his, \he, \him, \himself 2018-05-25 18:39:37 -07:00
Tayyyyyyy
aa9d658847 Them 2018-05-25 18:34:28 -07:00
Tayyyyyyy
170266d827 More pronouns 2018-05-25 18:34:23 -07:00
Ansari
dd417c006b Uses define instead of "bombs" for styling reason. Fixes IED not logging into investigate due to its special mechanism. 2018-05-18 12:23:08 +08:00
Ansari
792f3ada27 Fixes spacing 2018-05-18 07:05:05 +08:00
Ansari
2e870f8038 Remove all instance of bombers. Replace "bomber list" in secrets with "bombs" in investigate. Remove useless clear bomb function. 2018-05-17 23:14:29 +08:00
Fox McCloud
cfe182a1f7 Ports over Timer Subsystem 2018-04-28 20:26:04 -04:00
Fox McCloud
8c7b543415 The Great Conflictening 2.0: Removes /obj/item/device 2018-04-25 23:07:35 -04:00
tigercat2000
c03621c508 Completely Overhaul Logging
This is a merged port from /tg/station and Virgo on logging standards.
The diary has been replaced with GLOB.world_game_log, diaryofmeanpeople
is gone (because it wasn't actually used) and a whole bunch of logging
procs have been changed to optimize Splunk.
2018-04-19 15:07:59 -08:00
Fox McCloud
5c4aa9b3fd Removes All Weapons 2018-04-15 16:25:56 -04:00
Fox McCloud
22dc6860b3 Ports TG's Garbage Subsystem 2018-03-28 20:02:39 -04:00
uraniummeltdown
75e177b7a9 renames receive_damage() for animations to receiving_damage()
renames take_damage() for organs to receive_damage()
renames Deconstruct() to deconstruct() for atmos objects
obj_integrity, max_integrity, integrity_failure vars moved to /obj level, obj_integrity = max_integrity on New()
2017-12-28 00:32:54 +05:00
Birdtalon
af2035af2b pineapples grow on plants not trees 2017-08-26 22:47:05 +01:00
Birdtalon
bf5ea8fcea final additions 2017-08-26 22:33:01 +01:00
Fox-McCloud
223d608aa8 styling 2017-08-01 18:31:52 -04:00
Fox-McCloud
ca49a28f02 Updates Hydroponics, Nerfs it, Adds Onions 2017-08-01 17:58:23 -04:00
Crazylemon64
807084e304 Most of fox's changes 2017-07-21 15:20:12 -07:00
Crazylemon64
a8e7716649 Refactors slipping to be completely general for items 2017-07-16 19:20:55 -07:00
Sam
2d13e2f7bf Converts /modules/ to using WEIGHT_CLASS_x 2017-05-28 01:25:09 +01:00
davipatury
b91fbe264e effect/glowshroom to structure/glowshroom 2017-03-27 18:52:19 -03:00
davipatury
82bfd6e4b3 effect/spacevine to structure/spacevine 2017-03-27 18:51:08 -03:00
uraniummeltdown
0f5c0e40e2 nerf station lighting along with shadowshroom glow power, fix shroom spreading, endurance fix 2017-03-23 14:12:17 +04:00
uraniummeltdown
658e0f6a82 adds shadowshrooms from tgstation, nerf glowshroom glow a bit and add new vars for glow, add new shadow and red light genes 2017-03-11 13:36:04 +04:00
Jike
041c573f42 Makes carrot wedges available through the processor instead of cutting with a knife 2017-03-06 18:15:47 -04:30