Commit Graph

30864 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
6218323c0a Merge pull request #10664 from Nicaragua1/clown-locker
Clown and mime locker acceses
2019-01-18 08:24:14 +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
Nicaragua
cfebb0ec8e removed old PR 2019-01-16 21:51:02 -03:00
Nicaragua
7fed4e7fbd Fixed Clown and mime locker acces
- They arent public acces anymore.
-Now only clowns can open / lock their lockers
-Mimes can only open / lock their own lockers
2019-01-16 21:49:26 -03:00
datlo
07a38a3a26 fix borg spawner logic error 2019-01-16 10:22:31 +00:00
Shadow-Quill
b497d92cc0 Ventilation 2019-01-15 23:56:26 -06: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
Nicaragua
86e3d679c2 Update goldgrub.dm 2019-01-14 19:38:26 -03:00
Nicaragua
7d5364acd3 goldgrub 2019-01-14 17:19:54 -03: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
c0ec880688 Merge pull request #10621 from datlo/pinpointer4everyone
Nuke ops spawn with their pinpointer
2019-01-14 21:33:44 +08:00
variableundefined
910df1f3d0 Merge pull request #10639 from Kyep/playtime_for_sec_and_command
Updates playtime requirements, tracking
2019-01-14 21:30:45 +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
50bf7b61fe Secure closet addition and creation 2019-01-13 16:43:09 -07:00
B.A.L
1f1c50a15a Creates a Nanotrasen Navy uniform for magistrate 2019-01-13 16:43:09 -07:00
AzuleUtama
a58dbec910 Updated again, 10 bundles total now 2019-01-13 19:11:23 +00: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
alex-gh
95ef695530 Fixed runtime causing devils not to turn into blood lizards. 2019-01-13 12:46:46 +01:00
variableundefined
6d2a84b905 Merge pull request #10648 from FalseIncarnate/nanomob
Nanomob Battle Refactor
2019-01-13 19:29:19 +08:00
alex-gh
8047769ad2 Fixes destruction banishment condition. 2019-01-13 12:00:52 +01:00
alex-gh
8516957898 Reviving will now make you reenter body. 2019-01-13 12:00:52 +01:00
alex-gh
221da25e3b Fixed antagHUD for devils. 2019-01-13 12:00:51 +01:00
alex-gh
4a5c8754be Fixes ressurection if the devil body is destroyed. 2019-01-13 12:00:51 +01:00
alex-gh
bdd46759a1 Made devil entries in traitor panel behave consistently with other entries. 2019-01-13 12:00:51 +01:00
alex-gh
c00e42c732 Added logging to fireball. 2019-01-13 12:00:51 +01:00
alex-gh
ead4bb109a Reduced devil spawn numbers for less chaos. 2019-01-13 12:00:51 +01:00
alex-gh
6f287395f0 Removed unneeded definitions. 2019-01-13 12:00:50 +01:00
alex-gh
78dedf18a4 Fixed true devil deafness. 2019-01-13 12:00:50 +01:00
alex-gh
1eb93cd16c Fixes self-ressurection, losing languages. 2019-01-13 12:00:50 +01:00
alex-gh
e1f8b708f9 Fixes infernal jaunt 2019-01-13 12:00:50 +01:00
alex-gh
a29f36e4b8 Unbreaks defibs and SR 2019-01-13 12:00:50 +01:00
alex-gh
1f171b6f5e Restricts security and borgs from being devils. 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