Commit Graph
759 Commits
Author SHA1 Message Date
variableundefinedandGitHub 1e62ac30ad Merge pull request #11439 from Arkatos1/LingIcons
Changeling Evolution - Action Buttons!
2019-05-17 19:15:16 +08:00
Fox McCloud 68effd9d83 The End 2019-05-13 17:22:57 -04: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
Arkatos1 1c74f848e1 Merge https://github.com/ParadiseSS13/Paradise into LingIcons 2019-05-10 14:41:08 +02:00
AffectedArc07 510c210930 Merge 2019-05-09 17:06:35 +01: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
Arkatos1 6020d1d397 Merge https://github.com/ParadiseSS13/Paradise into LingIcons 2019-05-04 15:27:48 +02:00
Couls fb619648a9 Resolve conflicts 2019-05-03 22:28:04 -04:00
Mark van Alphen bbeb07abd2 More lighting fixes 2019-05-04 03:06:10 +02:00
Mark van Alphen 35b1cee88b Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
# Conflicts:
#	icons/obj/toy.dmi
2019-05-03 18:31:45 +02:00
Mark van Alphen d646ab0934 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lighting
# Conflicts:
#	code/game/area/Space Station 13 areas.dm
2019-05-03 18:30:07 +02:00
Twinmold93 fe0c04534f Moved to MC Tab
Moves the time stamp to the MC Tab per Fox's request.
2019-05-02 12:59:05 -05:00
Arkatos1 2e4de13f0f Initial commit 2019-05-02 01:30:17 +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 AlphenandGitHub ad2238f496 Merge branch 'master' into lighting 2019-04-30 19:15:58 +02:00
AffectedArc07 ec790efeaa SSticker 2019-04-30 16:47:47 +01:00
Twinmold93 726e0af91a rebase 2019-04-29 23:43:32 -05:00
variableundefinedandGitHub 5b98e861f0 Merge pull request #11299 from Kyep/ssd_auto_cryo_option
Better SSD management
2019-04-30 11:29:49 +08: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
Couls a8db26df98 Merge remote-tracking branch 'upstream/master' into diagonal-movement 2019-04-25 23:45:08 -04: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
variableundefinedandGitHub 624699e6d9 Merge pull request #11332 from Arkatos1/VarArts
Adds an option to grant Martial Arts via Var menu
2019-04-23 20:47:03 +08:00
Couls a188a6b890 change some move procs 2019-04-23 05:56:12 -04:00
Couls 7eb7d723f9 Implement keybinding system and remove old hotkey modes 2019-04-23 01:31:03 -04:00
Kyep d61d8a3dc1 new feature: ssd warning system 2019-04-22 21:38:47 -07:00
Arkatos1 b0182639b2 Adds an option to grant Martial Arts via Var menu 2019-04-19 16:54:59 +02:00
joep van der velden 9166de2a3d puke update 2019-04-13 10:56:30 +02:00
joep van der velden 55282f15d6 less puke related lag 2019-04-12 22:58:11 +02:00
Mark van Alphen 7149dd6aad Goliath improvements 2019-03-30 05:20:27 +01:00
Mark van Alphen b8e840c094 Resolve some issues that the compiler doesn't spot 2019-03-29 16:21:15 +01:00
Mike Longandalex-gh 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
Desolate f7627d2fcb Resolves conflicts. 2018-10-11 05:36:22 -05:00
Crazylemon64 3db4229918 First big chunk of the refactor
mid-refactor of `take_overall_damage`

Fully refactors the (?:take|heal)_(?:overall|organ)_damage procs

Allows the dead to examine

Removes the `blinded` var

Refactor cyborg components so vision loss is instant

Robot life/death updates instantly

Adds instant updates for damage overlays and HUD icons for humans

Final reconciliation with the species refactor

Adds a stat debugging system and debugging logs

Also fixes instant death on species change

"Debugging logs" are used for stuff an admin wouldn't care about but
someone debugging would

I used it to fix people dying instantly when changing species due to
temporary deletion of the brain

Fox's requests

Adds a more careful updating system to our reagents system
2018-10-07 17:52:04 -07:00
Desolate 4c062212ab refactors global lists. 2018-10-06 08:02:45 -05:00
Desolate c974e29a3c global lists global defined 2018-10-02 15:52:46 -05:00
Crazy LemonandGitHub ca26739109 Merge pull request #9477 from variableundefined/SSPortShuttle
Port Shuttle to StonedMC
2018-10-01 01:13:42 -07:00
nicetoolbox fdc7297954 Reveal speaker identity when using megaphone 2018-09-27 20:36:13 -07:00
variableundefined bc22544919 Port Shuttle to StonedMC 2018-09-02 22:22:33 +08:00
Unknown cf9e3f6bef taking items off people is more consistent
so is putting them on people
2018-08-28 11:40:47 +02:00
Crazylemon64 b2d0bb1c0b Fixes maploading so that the cyberiad and space hotel load cleanly again 2018-07-24 20:58:38 -07:00
Fox McCloud 7440dad57e further conversion 2018-07-18 01:13:24 -04:00
FalseIncarnate 18a0ff541e Better solution
Repathed the point decal to the temp_visual effects path. This path has
built-in singularity resistance, and allows me to remove a spawn in
favor of a built-in QDEL_IN call

Also changed points from using the magic number 16 to POINT_LAYER for
their layer definition. This does technically drop the point by 4 layers
(POINT_LAYER is 12), placing them now below the light layer (shouldn't
affect anything) instead of just above it.
2018-05-30 21:55:26 -04:00
Tayyyyyyy 919bd7aaf2 Replace \his, \he, \him, \himself 2018-05-25 18:39:37 -07:00
tigercat2000 85a19c9935 Merge remote-tracking branch 'upstream/master' into face_lock
# Conflicts:
#	code/modules/mob/mob.dm
2018-05-17 20:21:39 -07:00
tigercat2000 7d8c9a731a SS Conversion: Atoms, Machines, n' Mobs
This converts the machine and mob processes to the SMC. Additionally, it
adds the Atom subsystem, which handles all Initialize() calls in place
of the old gameticker. Due to incompatibility with our atmospherics
(FUCK OUR ATMOSPHERICS FOR FUCKING EVER JESUS CHRIST WHO THE FUCK MADE
THIS PIECE OF GODDAMN SHIT) atmospherics machines do not use
Initialize() as they should, instead opting for a custom atmos_init
proc that the air controller handles.
2018-04-28 17:55:15 -07:00
tigercat2000 3d55fb6a83 Leaving viewers() will now break a lock 2018-04-27 13:48:56 -07:00
Fox McCloud 8c7b543415 The Great Conflictening 2.0: Removes /obj/item/device 2018-04-25 23:07:35 -04:00
tigercat2000 caccc13e82 Directional Locking
This adds the ability to lock your mob towards facing either a certain
direction or a certain atom. Direction is done by shift-middleclick,
atom is done by shift-ctrl-middleclick.
2018-04-19 19:01:29 -08:00