Commit Graph

871 Commits

Author SHA1 Message Date
Citinited 9976ad9ea1 Adds airlock spawners 2019-04-27 21:41:36 +01:00
Mark van Alphen 4423962a2a Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
# Conflicts:
#	code/controllers/subsystem/mapping.dm
#	paradise.dme
2019-04-26 23:07:57 +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
Fox McCloud 0034e851a1 Kills off Object and Fast Object Processes 2019-04-23 23:53:40 -04:00
Mark van Alphen affae89028 Attempt update to /tg/ lighting system 2019-04-22 19:55:41 +02:00
Mark van Alphen 211468b24f Add fake ambient occlusion 2019-04-21 01:45:30 +02:00
Mark van Alphen 092773132d no_lava fix, make sure simple explosions don't nuke the Syndicate base 2019-04-20 03:09:13 +02:00
Mark van Alphen c878f8e36e Lavaland code review fixes - also integrates flyswatter and cat toy 2019-04-20 00:24:58 +02:00
Mark van Alphen f94796c125 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
# Conflicts:
#	code/game/objects/items.dm
#	icons/turf/floors/plating.dmi
#	paradise.dme
2019-04-10 21:54:54 +02:00
Fox McCloud 879b50fa10 Merge pull request #11253 from Citinited/foamedmetal-fix
Foamed metal fixes
2019-04-09 22:38:37 -04:00
variableundefined ff8dc59367 Merge pull request #11229 from Fox-McCloud/reagent-tweaks
[Goonchem] Reagent tweaks
2019-04-07 21:22:18 +08:00
Citinited 9f8099637a Foamed metal will no longer turn transit turfs into metal floors; fixes foamed metal floors not having a sprite 2019-04-06 20:48:00 +01:00
Mark van Alphen 391d91132c Fix code review issues (planetary_atmos and Initialize()) 2019-04-04 23:23:30 +02:00
Mark van Alphen a21ec0f30b Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
# Conflicts:
#	code/modules/mob/living/simple_animal/hostile/hostile.dm
2019-04-04 22:04:55 +02:00
CornMyCob e02087d474 blood drunk miner 2019-04-04 20:34:26 +01:00
Fox McCloud 282350fb71 Tweaks Foam and Pyrotechnics 2019-04-04 05:06:39 -04:00
variableundefined cc831667cd Merge pull request #11081 from Kyep/hijack_limits
Syndie Uplink changes (better interface, hijack-only firegrenades)
2019-04-04 09:30:56 +08:00
Fox McCloud 6fadf083d7 OHHHH SHITTTT ANTTTSSS 2019-04-01 01:27:49 -04:00
Mark van Alphen ed153d3566 Add seed vault and animal hospital 2019-03-31 23:49:18 +02:00
Mark van Alphen 1619bc048b Lavaland baseturf implementation 2019-03-31 22:07:30 +02:00
Mark van Alphen 1689e46f1e Added Syndicate base and ported over turf decals 2019-03-31 20:26:02 +02:00
Mark van Alphen bf68f966b1 Add Ash Walkers, work on Syndicate base 2019-03-31 04:33:39 +02:00
Mark van Alphen 45a066c7d1 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
# Conflicts:
#	code/modules/food_and_drinks/recipes/recipes_grill.dm
2019-03-30 22:55:09 +01:00
Mark van Alphen f92be2c67d Add Beach biodome ruin and other fixes 2019-03-30 22:48:11 +01:00
Mark van Alphen e1b18e07c6 Fix temporary visuals 2019-03-30 06:15:07 +01:00
Mark van Alphen 7149dd6aad Goliath improvements 2019-03-30 05:20:27 +01:00
Mark van Alphen fb337f2825 Port over Lavaland mobs and turfs (not finished) 2019-03-29 23:45:36 +01:00
Fox McCloud ae7a141d28 fixes smoke 2019-03-24 18:44:01 -04:00
Fox McCloud 1d0cdbe8a9 fix this too 2019-03-24 17:04:48 -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 d33e09fdc4 Merge pull request #11103 from farie82/holo-firelock-fix
Fixes a few atmos bugs when structures get destroyed/removed
2019-03-24 03:16:42 -04:00
joep van der velden f903290e1c better way 2019-03-24 07:59:39 +01:00
joep van der velden d04254a668 fixes more 2019-03-23 15:10:58 +01:00
Fox McCloud f14359a0dd effects fixes smoke layer 2019-03-22 14:33:36 -04:00
Fox McCloud 4f99cc91d3 Merge remote-tracking branch 'upstream/master' into goonchem-reagent-temperature 2019-03-22 14:07:46 -04:00
Kyep 3559a77d0f Uplink improvements 2019-03-19 04:35:03 -07:00
Fox McCloud ea752e7191 safety 2019-03-19 03:10:47 -04:00
Fox McCloud 277722508a [Goonchem] Reagent Temperature 2019-03-18 20:06:15 -04:00
Fox McCloud f01af6ae20 Implements Goon Smoke 2019-03-15 19:09:29 -04:00
datlo 0358bfef42 fix bugs, remove cult free golems 2019-02-04 13:11:11 +00:00
Citinited 41ac5e0027 Repath of sexy clown gear: part 1 2019-02-01 21:46:58 +00:00
Shadow-Quill b497d92cc0 Ventilation 2019-01-15 23:56:26 -06:00
variableundefined 1b6022ac93 Merge pull request #10632 from Kyep/trader_tweaks_2
Sol Trader Updates 2
2019-01-14 21:35:47 +08:00
variableundefined c954df84be Merge pull request #10272 from alex-gh/diabolical_resurrection_resurrection
[Ready? TM Ready] Diabolical resurrection resurrection
2019-01-13 19:59:04 +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
FalseIncarnate 885bc808b3 Nanomob Battle Refactor
Refactors Nanomob Battle terminals to utilize landmarks for positioning their battle avatars, rather than a hard-coded offset.

This means the terminals no longer require var edits or strict placement rules for mapping. Each terminal will attempt to locate the closest battle landmark and spawn their avatars there, so this also lays some very basic groundwork for supporting multiple battle arenas on a single map.
2019-01-13 01:22:23 -05:00
Kyep 28ae61ee2c +talisman, -midgitSE, +cluster grenades, -goliathhide, +KAmodkit, +bartenderkit, +chefkit, -bananade 2019-01-10 17:24:55 -08:00
Kyep e69c74259a adds BoH/nvmeson/matscanner/thermals, moves speed potion 2019-01-10 16:01:46 -08:00
Kyep dd2808313e adds bluespace rpd, removes strange object 2019-01-10 15:36:12 -08:00
Kyep 51279caafd adds healgland, cycler shotgun, enforcers, oxytank 2019-01-10 15:19:41 -08:00