Commit Graph

314 Commits

Author SHA1 Message Date
Fox McCloud
d29be05f74 the-figment-that-was-is-now-gone 2019-10-01 19:08:15 -04:00
Fox McCloud
9097dfcacf Merge remote-tracking branch 'upstream/master' into universal-damage
# Conflicts:
#	code/game/machinery/machinery.dm
#	code/game/objects/items.dm
#	code/game/objects/structures.dm
#	code/game/objects/structures/inflatable.dm
#	code/game/objects/structures/mirror.dm
#	code/modules/clothing/spacesuits/hardsuit.dm
#	code/modules/clothing/suits/wiz_robe.dm
#	code/modules/mob/living/carbon/alien/alien_defense.dm
#	code/modules/mob/living/carbon/slime/slime.dm
#	code/modules/mob/living/simple_animal/friendly/slime.dm
2019-09-28 00:16:11 -04:00
Fox McCloud
cb8529cdb8 Makes Xenobiology Simpler. Removes Slimes (#12398) 2019-09-24 16:17:33 -07:00
Fox McCloud
86e6d85093 Nutrition Refactor (#12389) 2019-09-24 15:17:55 -07:00
Fox McCloud
62226851d9 Merge remote-tracking branch 'upstream/master' into universal-damage 2019-09-23 12:53:52 -04:00
Fox McCloud
c87389a595 TG Buckle Update (#12375) 2019-09-22 18:22:57 -07:00
Fox McCloud
238ea19d09 Merge remote-tracking branch 'upstream/master' into universal-damage
# Conflicts:
#	code/modules/clothing/suits/labcoat.dm
#	code/modules/clothing/under/miscellaneous.dm
#	code/modules/mob/living/carbon/human/species/golem.dm
#	code/modules/mob/living/simple_animal/bot/ed209bot.dm
2019-09-21 12:40:07 -04:00
Coul
d89d4dbc38 fixes some missing arguments and runtimes 2019-09-16 16:18:16 -04:00
Fox McCloud
af92373d33 though-this-world-may-be-broken 2019-09-15 05:53:43 -04:00
Fox McCloud
59082ff21a space dragonnnn 2019-09-11 13:52:33 -04:00
Fox McCloud
dca6d98f5f Refactors Corgis 2019-09-04 18:40:34 -04:00
datlo
72f1424b91 clarify spell descs 2019-08-28 20:26:17 +02:00
datlo
23fe308908 Add the banana touch and mime malaise spells 2019-08-28 19:49:52 +02:00
Arkatos1
6b2add6eb9 Deconflict 2019-08-26 18:53:55 +02:00
Arkatos1
c9ccf56ebd Merge https://github.com/ParadiseSS13/Paradise into Magic-With-Style 2019-08-12 16:34:52 +02:00
joep van der velden
402d1ef131 No drop items now lose their nodrop if dropped 2019-07-29 00:03:18 +02:00
Mark van Alphen
fea2b2532d Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into cultthings
# Conflicts:
#	paradise.dme
2019-06-09 23:28:41 +02:00
Arkatos1
102e27b3c2 Magic with style update 2019-06-04 00:37:42 +02:00
Mark van Alphen
e6b7fd9149 Move night vision spell and give it to constructs 2019-05-09 03:11:06 +02:00
AffectedArc07
ec790efeaa SSticker 2019-04-30 16:47:47 +01:00
Fox McCloud
90c9f3f479 Refacors Electrocution 2019-04-10 18:09:14 -04:00
Fox McCloud
d0ea5ee8b9 Crit Rework Final Submission 2019-03-28 17:28:00 -04:00
Aurorablade
d3448cf287 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into EXTERMINATUSPARTONE 2019-01-29 17:42:39 -05:00
Kyep
43cbaf1f6a Fixes shapeshift spell definitions
Prior to this PR, there were '/list' subtypes of many shapeshift spells, because some of their vars were set incorrectly.  This PR sets the vars correctly, removing the erroneous spell subtypes in the process.
2019-01-26 19:13:37 -08:00
Aurorablade
b812736517 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into EXTERMINATUSPARTONE 2019-01-19 23:35:15 -05:00
Aurorablade
4fc35a68b1 Gonna have to clean some files after this. 2019-01-19 22:38:47 -05: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
e1f8b708f9 Fixes infernal jaunt 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
datlo
38e6e20941 Refactor and buff wizard force wall, add greater force wall to spell book 2018-12-25 04:49:24 +00:00
variableundefined
9ebd0d255e Merge pull request #10473 from Aurorablade/HONK
Ports Clown Goblins, Adds Honk Missle, Fixes Space Carp Event, Adds Honomoly Event
2018-12-24 09:20:24 +08:00
variableundefined
e892535b27 Merge pull request #10364 from Allfd/nofunallowed
Remove fart based mechanics
2018-12-24 09:13:47 +08:00
Aurorablade
daf04fa8de honkening 2018-12-17 22:41:14 -05:00
variableundefined
4de3d741a5 Merge pull request #10449 from 1fbff5f83b23d39d38b1dfcb4cac8d9b/let-there-be-light
fixes lightning
2018-12-13 09:37:58 +08:00
Joe Schmoe
3a7e06960a fixes lightning 2018-12-12 22:40:45 +01:00
variableundefined
00a0acb2ec Merge pull request #10340 from Kyep/chaplain_1
Chaplain tweaks
2018-11-29 14:22:03 +08:00
Kyep
b4acc30b2e removes alignment system 2018-11-28 19:23:26 -08:00
Alffd
183e47a28e Rework rathens 2018-11-26 22:01:22 -05:00
Kyep
58ee1ce058 chaplain can no longer tell who is already blessed 2018-11-25 16:33:21 -08:00
datlo
2c3541b95f Fix a couple of finger gun issues 2018-11-25 19:04:53 +00:00
Kyep
3256ed83e3 updates based on feedback, mostly Tay's 2018-11-24 19:30:39 -08:00
Tayyyyyyy
e7e4a277b1 Apply suggestions from code review
p.them suggestions

Co-Authored-By: Kyep <16434066+Kyep@users.noreply.github.com>
2018-11-25 03:23:18 +00:00
Kyep
b50016891e removes all spells but bless, fixes bugs, adds holy torch 2018-11-24 14:07:21 -08:00
datlo
aca8b5ca0f changes vow of silence/spell adding checks 2018-11-24 16:08:47 +00:00
Kyep
b139af2bdd v1 2018-11-23 20:08:49 -08:00
datlo
b94beb061a divided mime.dm 2018-11-23 07:47:35 +00:00
datlo
a80efa4924 Add the advanced mimery kit to mime uplinks
Also adds :
Mime specific spellbooks
TG wizard forcewall (mime is a subtype, will implement for wiz later
probably)
Fake finger gun spellbook in arcade
2018-11-23 07:23:34 +00:00
Kyep
39b6725555 hellhound + minor tweaks 2018-11-20 15:19:19 -08:00
Kyep
1c8542414d ancient vampire raise vampires/shapeshift 2018-11-18 16:54:26 -08:00