Commit Graph

513 Commits

Author SHA1 Message Date
Fox McCloud
0b06a32cc9 Merge pull request #11165 from Markolie/issues
Resolve some issues that the compiler doesn't spot
2019-04-01 18:22:43 -04:00
Mark van Alphen
b8e840c094 Resolve some issues that the compiler doesn't spot 2019-03-29 16:21:15 +01: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
variableundefined
9d821534a5 Merge pull request #10845 from Quantum-M/bureaucraticUpdate
Updates stamps and adds contract sprites.
2019-03-14 15:04:40 +08:00
Citinited
4c1c8ce21b he -> he or she and splits up the huge line into six lines 2019-02-11 23:38:15 +00:00
Citinited
8d88900a04 spellchecks Nanotrasen contract 2019-02-11 23:26:55 +00:00
B.A.L
9888cf8c74 Updates stamps and contract sprites. 2019-02-07 21:01:55 -07:00
Aurorablade
d3448cf287 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into EXTERMINATUSPARTONE 2019-01-29 17:42:39 -05:00
Dovixx
6741238ef1 Stop the animals! 2019-01-23 22:34:51 +02:00
Aurorablade
b812736517 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into EXTERMINATUSPARTONE 2019-01-19 23:35:15 -05:00
variableundefined
b8cf02722b Merge pull request #10651 from alex-gh/devil_expansion
Devil friends
2019-01-15 07:47:57 +08:00
B.A.L
998ecc0634 Magistrate Stamp 2019-01-13 16:44:39 -07:00
alex-gh
3c3a2b39f9 Activates friendship contracts. 2019-01-13 18:35:30 +01:00
alex-gh
c00e42c732 Added logging to fireball. 2019-01-13 12:00:51 +01:00
alex-gh
7267dafba9 Fixes being unable to sign the infernal contract. 2019-01-13 12:00:50 +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
d488195799 fix merge conflict, wipe map changes 2019-01-03 14:39:41 -08:00
Aurorablade
86d2a1634c Casing correction 1 2018-12-17 00:07:37 -05:00
datlo
78908646e0 updated var names and joke message 2018-12-14 03:21:10 +00:00
datlo
1a7aaab0ff add global cap on printing papers 2018-12-14 02:41:52 +00:00
variableundefined
f7ec561a4f Merge pull request #10440 from datlo/faxemagtweak
Remove access requirement on emagged fax
2018-12-13 22:59:27 +08:00
Kyep
702f4db165 outfit, vehicles, paperfix, viruses 2018-12-12 00:31:56 -08:00
variableundefined
9e59827416 Merge pull request #10351 from Citinited/duct-tape-stick-tweak
You can stick duct tape to more than just paper now
2018-12-11 20:18:05 +08:00
datlo
5f771d46da remove access requirement on emagged fax 2018-12-11 07:48:57 +00:00
Kyep
4427d02acd researchnotes, pills, injector runtime 2018-12-09 00:41:11 -08:00
Citinited
6354631937 Fixes lots of items not being taped by duct tape; tape won't be applied to bags if it can be inserted 2018-12-01 00:13:21 +00:00
Citinited
88ff4eb49f Some fixes for taping, also bumps up max_amount for tape rolls and adds a tape supply pack 2018-11-28 22:21:59 +00:00
Citinited
05b9955f2b You can stick duct tape to more than just paper now 2018-11-25 23:03:10 +00:00
tigercat2000
e56750481c Multilingualism
This commit adjusts the speech parsing system to allow for an infinite
number of languages to be present in the same message. You can
transition freely between any language you are able to speak simply by
putting it's language key in the middle of the sentence.

Honestly, this was a massive pain in the ass, and there's probably still
broken stuff, even though I've spent around 8 hours testing and refining
this.
2018-11-24 00:22:05 -08:00
Kyep
079848cccc evilfax/bless update 2018-11-13 18:16:49 -08:00
variableundefined
4778d4de5d Merge pull request #10062 from Dave-TH/paper_fix
Paper Bundles No Longer Automatically Display Their Contents
2018-10-30 10:53:58 +08:00
Unknown
f4d5f73261 Fixes Paper Bundles Bug 2018-10-29 21:31:49 -04:00
joep van der velden
e6ef48c39e Bad renault 2018-10-27 16:27:31 +02:00
variableundefined
600de8ba24 Deconflict 1 2018-10-21 07:56:55 +08:00
Mark Mak
4bc1a1c1ef Merge pull request #9363 from MarsM0nd/Refactor_UID
Href refactor: macros and playerpanel
2018-10-19 07:46:42 +08:00
tigercat2000
b4001d9ab8 Merge pull request #9446 from variableundefined/PaperBundleRuntime
Fixes paper bundle runtimes
2018-10-14 07:22:38 -07:00
variableundefined
65c246c1c9 TG container_type refactor 2018-10-13 08:20:52 +08: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
Purpose
6cb07cb70c Fixes a bunch of shown messages 2018-09-29 19:10:10 +01:00
variableundefined
68c35ccced Merge pull request #9527 from Ty-Omaha/muh-art
Fixes half the server crashing, removes canvases
2018-09-29 07:49:30 +08:00
Purpose
037f215d16 updates vars to use the defines 2018-09-16 01:22:57 +01:00
Ty-Omaha
28acdb1e56 removes canvases 2
fully removes it as per tiger's critique
2018-09-12 02:40:32 -04:00
alex-gh
49f3a47c31 Ghosts can no longer eject IDs from fax machines and ID computers. 2018-09-09 00:28:14 +02:00
variableundefined
ade853c742 remove excessive the 2018-09-04 09:41:09 +08:00
variableundefined
bd8f0396c2 Photocopier safety check 2018-08-29 22:40:16 +08:00