Commit Graph

366 Commits

Author SHA1 Message Date
Crazy Lemon
f2651d43b1 Merge pull request #11421 from Arkatos1/WizardRevenge
Wizard Update - Revenge of the Federation
2019-06-02 15:27:42 -07:00
Mark van Alphen
ef479cb982 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
# Conflicts:
#	icons/mob/feet.dmi
#	paradise.dme
2019-05-23 19:04:09 +02:00
variableundefined
17bbe5659c Merge pull request #11520 from Citinited/spooky-apcs
Boo affects APCs (again) & no more infinite Boo
2019-05-23 23:49:47 +08:00
Arkatos1
d2f50269d7 fixed ghost vision 2019-05-19 19:47:46 +02:00
Citinited
da51a3315c Fix for infinite boo 2019-05-18 13:02:06 +01:00
Arkatos1
e985bb672e Merge https://github.com/ParadiseSS13/Paradise into WizardRevenge 2019-05-13 22:21:48 +02:00
Mark van Alphen
0f98a95666 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
# Conflicts:
#	icons/mob/actions/actions.dmi
#	paradise.dme
2019-05-13 22:14:38 +02:00
Citinited
cd3b25bd24 Boo affects APCs again
Also reworks the boo code
2019-05-11 18:15:13 +01:00
Fox McCloud
eb95a42672 Fixes Ghosts Drifting 2019-05-09 02:51:44 -04:00
Fox McCloud
3d90ccbfb7 nevermind, just generic fixes 2019-05-08 20:15:24 -04:00
Mark van Alphen
2618def9a1 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
# Conflicts:
#	_maps/map_files/Delta/delta.dmm
#	_maps/map_files/MetaStation/MetaStation.v41A.II.dmm
#	_maps/map_files/MetaStation/z4.dmm
#	_maps/map_files/RandomRuins/SpaceRuins/derelict5.dmm
#	_maps/map_files/RandomRuins/SpaceRuins/spacebar.dmm
#	_maps/map_files/RandomZLevels/spacebattle.dmm
#	_maps/map_files/cyberiad/cyberiad.dmm
#	_maps/map_files/cyberiad/z4.dmm
#	_maps/map_files/cyberiad/z6.dmm
#	_maps/map_files/generic/z5.dmm
#	code/__DEFINES/misc.dm
#	code/__HELPERS/unsorted.dm
#	code/game/objects/structures/lattice.dm
#	code/game/turfs/space/space.dm
#	code/modules/mob/mob.dm
#	code/modules/ruins/ruin_areas.dm
#	paradise.dme
2019-05-08 21:40:35 +02:00
Mark van Alphen
79d761063a Rename ghost darkness images 2019-05-06 04:06:54 +02:00
Arkatos1
7363c31ea9 Initial commit 2019-04-30 23:59:28 +02:00
Mark van Alphen
ba0f6abb02 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
# Conflicts:
#	code/game/objects/items.dm
#	code/modules/power/cable.dm
#	icons/mob/inhands/items_lefthand.dmi
#	icons/mob/inhands/items_righthand.dmi
#	icons/obj/lighting.dmi
#	paradise.dme
2019-04-30 19:26:17 +02:00
Mark van Alphen
ad2238f496 Merge branch 'master' into lighting 2019-04-30 19:15:58 +02:00
Arkatos1
f5e93bdea2 Small dead tele refactor 2019-04-27 23:40:25 +02:00
Mark van Alphen
e4dd9110ee Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lighting
# Conflicts:
#	paradise.dme
2019-04-26 22:58:56 +02:00
Mark van Alphen
ccef4d1187 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
# Conflicts:
#	icons/mob/actions/actions.dmi
#	paradise.dme
2019-04-24 02:55:32 +02:00
Mark van Alphen
9e9d72d2ae Darkness fixes 2019-04-24 00:47:55 +02:00
Mark van Alphen
0d883a5b88 Darkness handling update 2019-04-23 22:59:00 +02:00
Fox McCloud
ff1edb1080 Merge pull request #11300 from Arkatos1/Ghost_Hud
Adds Observer HUD buttons + Refactor of some ghost verbs
2019-04-23 15:11:15 -04:00
variableundefined
b738f9a92f Merge pull request #11283 from Fox-McCloud/emote-refactor
Emote Refactor
2019-04-23 19:44:26 +08:00
variableundefined
b37e55998e Merge pull request #11278 from Arkatos1/Summon_Ghosts
New Wizard spell - Summon Ghosts!
2019-04-23 18:52:03 +08:00
Mark van Alphen
0128de1fa6 Make observers use the actual ghost layer so they appear above mineral turfs 2019-04-20 21:09:57 +02:00
Arkatos1
5ef674f4db Code improvement, for real this time 2019-04-13 23:20:58 +02:00
Arkatos1
424432d3c0 Code improvement 2019-04-13 23:15:45 +02:00
Arkatos1
065ebeff30 Adds Ghost HUD and refactors some ghost verbs 2019-04-13 22:56:09 +02:00
variableundefined
19a26909dc Merge pull request #11279 from Arkatos1/Orbit
Ghosts now orbit around their followed targets
2019-04-11 20:41:37 +08:00
Fox McCloud
c536c55b28 Emote Refactor 2019-04-10 15:42:12 -04:00
Crazy Lemon
1a57f440df Merge pull request #11257 from Fox-McCloud/nations-update
The Nations Update Everyone Deserves!
2019-04-09 20:47:34 -07:00
Arkatos1
da73c134db Ghosts now orbit their followed targets 2019-04-09 02:17:40 +02:00
Arkatos1
21d212767f Summon Ghosts spell 2019-04-08 21:45:09 +02:00
variableundefined
fc616d8a19 Merge pull request #11242 from Markolie/hotkeymode
Hotkey mode handling is now instantaneous
2019-04-07 21:21:21 +08:00
variableundefined
4f8494e89e Merge pull request #10999 from Kyep/ghost_verb
Tweaks Ghost Verb
2019-04-07 15:27:56 +08:00
Fox McCloud
8446632fbc The Nations Update Everyone Deserves! 2019-04-06 20:30:04 -04:00
Mark van Alphen
aa58a88296 Switch to client-side hotkey toggling 2019-04-05 22:45:05 +02:00
Ty-Omaha
337c4fad56 Stops ghosts from having ZZZ bubbles 2019-03-30 10:12:14 -04:00
joep van der velden
675ef68422 uses move resist now 2019-03-17 14:41:31 +01:00
Kyep
1978637be4 safety/is_admin_level, special_role alert, !job check 2019-03-13 06:06:41 -07:00
Kyep
1fb7a24dbc cleanup 2019-03-12 19:26:00 -07:00
Kyep
db6484b027 Fox update 2019-03-12 19:05:19 -07:00
Kyep
6c3fc730a8 Shadeykins 2019-03-10 06:07:49 -07:00
Kyep
b0a8555316 allow free ghosting while dead/unconscious 2019-03-07 02:23:08 -08:00
Kyep
5103e0e066 only move to cryo if ghosting while conscious 2019-03-07 02:20:57 -08:00
Kyep
67649281ef logic tweaks 2019-03-07 00:26:51 -08:00
Kyep
b33b19d141 Updates Ghost verb 2019-03-07 00:04:28 -08: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
lass9030
f45977273b Woops. Unfugged it. 2019-01-06 03:14:01 +01:00
lass9030
7931c03c6f shift to count defines 2019-01-06 03:00:22 +01:00
lass9030
af1f5cc976 a plus met a plus... 2019-01-06 00:56:43 +01:00