Commit Graph

19008 Commits

Author SHA1 Message Date
variableundefined
520494b987 Merge pull request #10657 from Quantum-M/HeadMirror
Medical Head Mirror
2019-01-18 18:06:15 +08:00
variableundefined
0b8ce92516 Merge pull request #10652 from AzuleUtama/syndieBundleRework
Syndicate Bundles - Increased overall value and added a new bundle
2019-01-18 18:04:59 +08:00
variableundefined
1bb6bd0772 Merge pull request #10660 from datlo/syndiborgfix
Fix syndicate borg spawner spawning saboteur instead of assault
2019-01-18 08:24:00 +08:00
lass9030
abd67b54a5 missing slash 2019-01-17 17:21:09 +01:00
lass9030
26d02c7abb sight update 2019-01-17 16:59:31 +01:00
variableundefined
d4d8ccc64a Merge pull request #10484 from Eniraz/jetpack-on-exosuit
Allows jetpacks to work in suit storage slot
2019-01-17 19:03:51 +08:00
B.A.L
876d70678d Sees to concerns and such. 2019-01-16 19:26:21 -07:00
datlo
07a38a3a26 fix borg spawner logic error 2019-01-16 10:22:31 +00:00
B.A.L
982fbaa5b3 Codework
Adds mirror to medical white closet, the mirror itself, and chance for surgeons to spawn with it.
2019-01-15 18:44:32 -07:00
variableundefined
b8cf02722b Merge pull request #10651 from alex-gh/devil_expansion
Devil friends
2019-01-15 07:47:57 +08:00
Jazz23
5c6dcd7874 I'm confused 2019-01-14 08:58:22 -08:00
Jazz23
cae50f085b Merge branch 'master' of https://github.com/Jazz23/Paradise 2019-01-14 08:41:48 -08: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
ae90cd1d6b Merge pull request #10615 from datlo/lessdumbassED
Remove default ID check on ED
2019-01-14 21:18:32 +08:00
B.A.L
2bc36aace8 Wig stuff 2019-01-13 16:44:39 -07:00
B.A.L
998ecc0634 Magistrate Stamp 2019-01-13 16:44:39 -07:00
B.A.L
1f1c50a15a Creates a Nanotrasen Navy uniform for magistrate 2019-01-13 16:43:09 -07:00
alex-gh
3c3a2b39f9 Activates friendship contracts. 2019-01-13 18:35:30 +01:00
variableundefined
003f2113a9 Merge pull request #10627 from Superhats/LGBTQ+
Gender neutrality
2019-01-13 20:39:43 +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
variableundefined
6d2a84b905 Merge pull request #10648 from FalseIncarnate/nanomob
Nanomob Battle Refactor
2019-01-13 19:29:19 +08:00
alex-gh
c00e42c732 Added logging to fireball. 2019-01-13 12:00:51 +01:00
alex-gh
a29f36e4b8 Unbreaks defibs and SR 2019-01-13 12:00:50 +01:00
alex-gh
05e57e0970 Fixes devils not showing up in check antaganists. 2019-01-13 12:00:50 +01:00
alex-gh
7267dafba9 Fixes being unable to sign the infernal contract. 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
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
Aurorablade
c5af806268 Asmerath Fluff item, Accordion inhands 2019-01-13 00:53:53 -05:00
variableundefined
6a533e305f Merge pull request #10610 from datlo/syndicatesaboteur
Add the Saboteur module to syndicate cyborgs
2019-01-13 08:17:42 +08:00
Kyep
a39a0df1f9 limit traders spawned to 2 2019-01-12 15:22:29 -08:00
variableundefined
1f2e76167b Merge pull request #10636 from datlo/nomorefatops
Fix disability removing on ERT/Nuke ops/ayy
2019-01-12 18:44:10 +08:00
datlo
f3da8e2a1d remove implied src 2019-01-12 07:44:31 +00:00
datlo
aeb1ed6007 make new proc that actually works 2019-01-11 20:55:12 +00:00
datlo
645e242ea6 Fix disability removing on ERT/Nuke ops/ayy 2019-01-11 19:20:46 +00:00
Jazz23
cdec3a53d2 Matching naming conventions.
All the other ones are like this.
2019-01-11 09:45:51 -08:00
Jazz23
489f6713ea Merge branch 'master' of https://github.com/ParadiseSS13/Paradise 2019-01-10 21:04:09 -08:00
Kyep
3cfce8eca5 trader event static weight 180, based on convo with neca 2019-01-10 19:42:30 -08:00
Kyep
f77e85810e enable event, but make it fail with msg on red+ alert 2019-01-10 17:43:56 -08:00
Shadow
62fddd54ad Changes centcom to CentCom and station to Station 2019-01-10 18:01:57 -06:00
Shadow-Quill
2549ced1e7 Removes a ! 2019-01-10 17:41:37 -06:00
Kyep
520d880140 makes 9mm rubber ammo clip say its rubber 2019-01-10 15:20:08 -08:00
Kyep
787aee9655 replace trade objectives with 15 plasma bars & 10,000c 2019-01-10 15:16:59 -08:00
Kyep
61e888cd2b adjusts experimental KA 2019-01-10 14:40:24 -08:00
AzuleUtama
25ee0ddade Syndie Bundle Rework 2019-01-10 19:23:47 +00:00
Superhats
90ed521322 Grey 2019-01-10 15:17:55 +01:00
Superhats
5b6357e384 Drask 2019-01-10 15:16:32 +01:00
Superhats
ab216026e7 Vox 2019-01-10 15:16:01 +01:00
Superhats
e157970b6d Dionas 2019-01-10 15:15:30 +01:00
Aurorablade
3aa3c942d1 FiXes CaPs
Makes the claiber type match the ammo type so it loads correctly in cap guns
2019-01-10 01:21:11 -05:00
variableundefined
a1f9a19fe2 Merge pull request #10557 from datlo/clownwiz
Adds the Staff of Slipping and Clown wizard outfit
2019-01-09 17:59:08 +08:00