Commit Graph

882 Commits

Author SHA1 Message Date
Crazy Lemon
8502c44df6 Merge pull request #11359 from Kyep/ipintel
Adds XKeyScore (from TG), forum link, removes old discord link
2019-05-30 19:57:18 -07:00
Kyep
3662b90265 fix, 'more info' for admins, better whitelist support, pre-client bans 2019-05-28 11:35:53 -07:00
tayyyyyyy
e288355182 Avoid announcing admin jobs 2019-05-18 02:01:32 -07:00
Kyep
1b0defba92 fixes merge conflict 2019-05-10 09:56:58 -07:00
Kyep
f4de59a4f8 adds whitelist functionality 2019-05-10 09:54:20 -07:00
AffectedArc07
510c210930 Merge 2019-05-09 17:06:35 +01:00
AffectedArc07
531201fab4 Merge branch 'master' into hooks-part4 2019-05-08 22:21:12 +01:00
Fox McCloud
6563a01bec Merge pull request #11489 from Markolie/lighting
Lighting fixes
2019-05-08 16:17:12 -04:00
Mark van Alphen
9b60ea5d95 Make sure the screen is reset, just in case 2019-05-08 17:22:24 +02:00
Mark van Alphen
71e3d5187f Lighting fixes: makes sure new_players have a HUD and that sight flags are reset properly 2019-05-08 17:18:27 +02:00
AffectedArc07
29f95173fc This wont cause a problem *server dies* 2019-05-07 22:08:38 +01:00
AffectedArc07
19d8efef68 Morgue Updating [Hooks P4] 2019-05-06 10:08:28 +01:00
AffectedArc07
96edeacec5 Removes unused hooks 2019-05-05 10:28:56 +01:00
variableundefined
3ba90f87df Merge pull request #11384 from Kyep/no_free_jobs
Adds error message when trying to join with no free job slots
2019-05-04 08:34:09 +08:00
variableundefined
6e79364b65 Here we go again 2019-05-03 21:47:07 +08:00
AffectedArc07
acf43fac3a V2 2019-04-30 19:19:18 +01:00
AffectedArc07
ec790efeaa SSticker 2019-04-30 16:47:47 +01:00
Kyep
1dccef300f Adds message if someone tries to join with no available slots. 2019-04-26 02:33:20 -07:00
AffectedArc07
52dff88bd9 Die monster! You don't belong in this world! 2019-04-17 16:30:43 +01:00
KasparoVy
489b10d47f Runtime resolved 2019-04-16 19:43:56 -04:00
KasparoVy
923614a475 Codes in the Undergarments, Final Sprite Tweaks & Armalis Fix
Removes the old Vox undergarments
Adds species_fitting of undergarments (making all the Vox versions usable) to update_icons and character setup preview
Disables undergarments for Armalis
Fixes & adjusts some Vox undergarment sprites based on testing results.
Removes flesh from shredded Vox uniform sprites.
2019-04-13 22:00:13 -04:00
UmeFuu
81ec0cfe8c Adds new hairs (code)
What does this PR do:
Adds about eleven new hairs, some of them are edits from other hairs requested by some people, credits to the original spriter/s
2019-03-14 04:37:38 -03:00
Aurorablade
389f055a5b Fixes a pathing format error that i should know better then not to do. 2019-03-06 20:22:02 -05:00
Aurorablade
ca629f4bd3 Pinapplehairfluff 2019-03-04 22:10:22 -05: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
variableundefined
d7b2648020 Merge pull request #10185 from Mitchs98/moveresist
Ports Move Force from TG
2018-12-28 20:53:07 +08:00
datlo
b0f60602a8 MERGE SHIT REEEEE IMMAH PUNCH A WALL 2018-12-18 11:47:29 +00:00
datlo
19e5271249 Added syndicate officer as a job proper 2018-12-07 11:07:49 +00:00
Lumi
8ba2a557f4 Lumi's Custom Sprites Fix
Changes the sprites and names of Lumi's custom IPC screen/face sprites. Lumi Face is now Lumi Eyes and Lumi Blush is now Lumi Music.
2018-12-07 14:18:37 +11:00
variableundefined
09deabd0fc Merge pull request #10343 from KasparoVy/lizard-face
Fixes Some Unathi Face Markings
2018-11-25 09:06:31 +08:00
KasparoVy
29399a3136 Fixes Some Unathi Face Markings
Fixes:
- Unathi Snout 2
- Unathi Points Head
- Unathi Sharp Tiger Head and Face
- Unathi Tiger Head and Face
Removes duplicate entry for an allheads-compatible marking.
2018-11-24 19:32:29 -05:00
KasparoVy
bf5f894b9d Corrects Datum Name for Consistency 2018-11-13 22:55:25 -05:00
KasparoVy
074b799c81 Fixes Vulpkanin Earfluff
Earfluff and Vulpine Fluff respectively.

The icon states in the vulp file had their names the wrong way around and there was a missing datum entry in the vulp facial hair file for regular old ear fluff.
2018-11-13 22:41:34 -05:00
Mitchell
7cd25c4d87 for ansari to view 2018-11-11 15:59:48 -06:00
variableundefined
e4904edab7 Fixes merge conflicts 2018-11-11 12:23:02 +08:00
variableundefined
ef7a4d9629 Split sprite accessories apart
Part two, unathi refactor missing a single file

Unathi refactor

I hate unathi now

Rename icon_state of unathi & ipc to become more clear and remove unnecessary info

Improve icon_state naming on multiple files, finish up IPC & Vox refactor

Separate grey tattoo into its own file

Separate vulp facial hair, body markings and tail markings

Fek

Adds in missing file in dme

Vulpkanin sprite renaming missing vulpine facial earfluffs

Rename vulpkanin facial hair and fixes them.

Tajaran facial hair split

Finish the PR basically

Final bit of renaming and re-arranging

Fixes for three bugs noticed in game

Rename some misnamed vulpkanin icons fixing them.

Fix missing vulp head markings
2018-11-11 12:11:57 +08:00
tigercat2000
db6e93c72c Remove catgirls 2018-11-08 20:58:04 -08:00
tigercat2000
e5d1ecb6a4 Merge remote-tracking branch 'upstream/master' into updateicons 2018-11-08 20:24:48 -08:00
tigercat2000
ab032b6737 SSoverlays for human icons, mostly works
Closer to working 100%

But legitimately /tg/ icons

Move lighting to it's own plane, fix observers

Fix humans layering over other objects incorrectly

Nyaaaaa~
2018-11-08 20:24:22 -08:00
Squirgenheimer
fcc86e1903 antag candidacy button can be clicked after join 2018-11-05 02:14:28 -05:00
Squirgenheimer
5d1ac25a64 moves skip_antag to client level, adds checks for it in autotraitor.dm and blob.dm 2018-11-05 02:02:40 -05:00
variableundefined
c373185e1e Revert "(TGCRP) - /tg/ catgirl refugee program" 2018-10-27 13:06:42 +08:00
tigercat2000
1aa33c97ea Nyaaaaa~ 2018-10-25 19:59:30 -07:00
Desolate
f7627d2fcb Resolves conflicts. 2018-10-11 05:36:22 -05:00
Purpose
63dfd411aa Resolved merge conflicts... I hope. 2018-10-06 16:01:34 +01:00
Desolate
4c062212ab refactors global lists. 2018-10-06 08:02:45 -05:00
Purpose
4e22a2d907 naked syndicates are useless syndicates 2018-10-05 23:13:19 +01:00
Desolate
c974e29a3c global lists global defined 2018-10-02 15:52:46 -05:00
Crazy Lemon
ca26739109 Merge pull request #9477 from variableundefined/SSPortShuttle
Port Shuttle to StonedMC
2018-10-01 01:13:42 -07:00
Purpose
c82cd93a89 Merge branch 'master' into Refactors-beds-stools-chairs 2018-09-29 15:36:27 +01:00