Commit Graph

1908 Commits

Author SHA1 Message Date
UmeFuu
649cf7a63a Adds new type of dough for cookies
New chemist reaction that creates cookie dough
10u milk + 10u flour + 5u sugar
2019-02-12 20:24:11 -03:00
datlo
7efeed6904 readd feedback i accidentally removed 2019-02-05 04:02:46 +00:00
datlo
d5190c58bb Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into freegolems 2019-02-05 02:51:51 +00:00
lass9030
ce06589c2a checks for moveresist 2019-02-04 22:26:05 +01:00
datlo
3f2c80fee5 Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into freegolems 2019-02-03 13:57:06 +00:00
variableundefined
ecd8f80af4 Merge pull request #10820 from MINIMAN10000/fuel-bomb-fix
Boom function now checks for fuel before fuel tank boom.
2019-02-03 17:22:16 +08:00
MINIMAN10000
516b7e0144 Boom function now checks for fuel before fuel tank boom. 2019-02-03 00:53:46 -08:00
datlo
224f32bab3 Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into freegolems 2019-02-03 06:41:02 +00:00
datlo
74a3631741 compilin and mostly workin
has runtimes due to body color
need to wrap up commented procs
2019-02-03 06:40:50 +00:00
Fox McCloud
b02ffcd6a8 Lack of Breath Incurs Silence 2019-02-02 00:15:52 -05:00
joep van der velden
53396bea95 Fixes the virology problem 2019-01-28 18:02:20 +01:00
variableundefined
70ddb65f29 Merge pull request #9287 from Citinited/funny-chemicals
Adds a new clown chemical 🤡
2019-01-28 06:11:38 +08:00
variableundefined
8ed01b6440 Merge pull request #10726 from TDSSS/syndie-med-borg-tweak
Gives syndie medical borgs hydrocodone instead of ether
2019-01-27 12:53:33 +08:00
Citinited
e542258e64 slight jestosterone description tweak 2019-01-26 13:21:03 +00:00
Citinited
eebd8d782f Uses squeak component to do this, fixes broken stuff & Travis 2019-01-26 13:21:03 +00:00
Citinited
27b7c87585 whoopsie 2019-01-26 13:21:02 +00:00
Citinited
4913f343ed Adds jestosterone component 2019-01-26 13:21:02 +00:00
Citinited
e71dfaf730 Moves stuff round slightly 2019-01-26 13:21:02 +00:00
Citinited
c1e9137fa3 Jestosterone plays a honk when mixed; better way of handling job check 2019-01-26 13:21:02 +00:00
Citinited
d45e33efb5 Removes jestosterone triggering upon alien attack, uses space drugs instead of mercury in its creation 2019-01-26 13:21:02 +00:00
Citinited
3f57d62efb Adds jestosterone 2019-01-26 13:21:02 +00:00
TDSSS
2bbff57c7c Gave syndie medical borgs hydrocodone 2019-01-25 14:33:02 +01:00
variableundefined
3445d46b20 Merge pull request #10689 from AzuleUtama/dampRagLidFix
Stops damp rag having a lid, refactors glass containers to let objects state if they lack a lid
2019-01-24 18:13:22 +08:00
AzuleUtama
898725ee60 Formatting, description and spelling changes 2019-01-22 16:45:13 +00:00
AzuleUtama
0293d2674c the rerefactor 2019-01-22 10:32:44 +00:00
AzuleUtama
feaa20352b fixes damp rag having a lid 2019-01-20 18:28:07 +00:00
alex-gh
a29f36e4b8 Unbreaks defibs and SR 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
bf9d0b088f merge conflict fix, reset map 2019-01-07 16:37:07 -08:00
variableundefined
6785ba9b06 Merge pull request #10602 from Fox-McCloud/auto-injector-fix
Fixes Auto Injectors
2019-01-06 18:21:47 +08:00
Fox McCloud
f6029631b1 Fixes Auto Injectors 2019-01-06 04:36:16 -05:00
variableundefined
25f4665da7 Merge pull request #10580 from datlo/capufakedeath
Capulettium/Capu+ fakes death convincingly
2019-01-06 16:12:56 +08:00
variableundefined
611dd5f56f Merge pull request #10572 from datlo/ayyylmao
Refactor grey wingdings and add grey translator implant
2019-01-06 16:10:27 +08:00
Kyep
0567eab562 Merge branch 'sol_trader_update' of https://github.com/Kyep/Paradise into sol_trader_update 2019-01-03 14:40:07 -08:00
Kyep
d488195799 fix merge conflict, wipe map changes 2019-01-03 14:39:41 -08:00
lass9030
b5939c77b7 move_force 2019-01-02 15:52:49 +01:00
datlo
244fcfc739 capu/capu+ fake death for realsies, add fake death pills to syndis/maint 2019-01-02 09:46:03 +00:00
datlo
e18eaf363d Refactor grey wingdings and add translator implant
also change mutadone not to remove roundstart genes
2019-01-01 15:20:46 +00:00
variableundefined
e892535b27 Merge pull request #10364 from Allfd/nofunallowed
Remove fart based mechanics
2018-12-24 09:13:47 +08:00
Kyep
46acb9338b sunglasses, seeds, KA, IMS, fleshy 2018-12-22 14:16:25 +00:00
Kyep
702f4db165 outfit, vehicles, paperfix, viruses 2018-12-12 00:31:56 -08:00
variableundefined
c54b0162bd Merge pull request #10425 from Shadow-Quill/chem-master-icon-autoupdate
Chem master icon autoupdate 2.0
2018-12-11 20:28:30 +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
Kyep
7c1f40ea14 WIP omnizine/SR/virus bottles, minerals 2018-12-08 19:33:21 -08:00
Shadow-Quill
e3c9901966 Deactivate Spess 2018-12-07 15:47:16 -06:00
Shadow-Quill
eefbaa703c Instead updates_icon
needs testing to make sure it works
2018-12-07 07:12:19 -06:00
Shadow-Quill
3509b1ad4a Wait for power to area, then update icon
Read the tin.
2018-12-06 15:20:18 -06:00
Shadow-Quill
f18b80f3a5 Changed slep to spawn
Is it better? IDK but looks better.
2018-12-06 15:01:20 -06:00
Shadow-Quill
8234054af3 Add sleep timer
To hopefully automatically update the sprite, so it isn't blank until it's force updated by powerchange/beaker.
2018-12-06 09:57:22 -06: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