Commit Graph

195 Commits

Author SHA1 Message Date
Mark van Alphen
2c1ccf6786 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
# Conflicts:
#	paradise.dme
2019-05-31 05:48:49 +02:00
Kyep
eaeea7ce2f adds forum link, removes boxen discord table 2019-05-29 14:56:28 -07:00
Kyep
3662b90265 fix, 'more info' for admins, better whitelist support, pre-client bans 2019-05-28 11:35:53 -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
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
Mark van Alphen
bdfb4af5c2 Starlight fixes 2019-05-04 03:38:21 +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
Kyep
07bd1b0cc0 fixes merge conflict 2019-04-30 00:54:49 -07:00
variableundefined
5e1a1fa10c Merge pull request #11389 from Kyep/hub_entry_update
Improves Hub Listing
2019-04-30 12:08:32 +08:00
Kyep
ebf807863f changed defaults 2019-04-29 20:49:52 -07:00
Kyep
6e145e208f save space, 'paracode', let byond handle playercount, -discord/-forum 2019-04-29 17:34:06 -07:00
Kyep
9bd40ef6f6 improves hub entry 2019-04-26 17:54:11 -07:00
Kyep
f9e70f3e61 increases default IPINTEL_SAVE_BAD 2019-04-26 01:32:51 -07:00
Kyep
d61d8a3dc1 new feature: ssd warning system 2019-04-22 21:38:47 -07:00
Kyep
374f175cdc SQL_VERSION / DB_VERSION 2019-04-22 17:37:10 -07:00
Kyep
4561ee94f8 WIP ports XKeyScore from TG 2019-04-22 16:53:20 -07:00
Kyep
4113b23985 ssd cryo timer option 2019-04-12 14:56:18 -07:00
Mark van Alphen
f9054eaca8 Fix map testing 2019-04-12 20:25:26 +02:00
Mark van Alphen
36b74eeaea Add proper config for ruins, helm fix, selfloop Lavaland 2019-04-12 19:41:31 +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
variableundefined
b208f7c17f Merge pull request #11177 from Ty-Omaha/Meaningful-Alerts
Makes "Start Now"'s confirmation meaningful
2019-04-02 18:30:43 +08:00
Fox McCloud
0b06a32cc9 Merge pull request #11165 from Markolie/issues
Resolve some issues that the compiler doesn't spot
2019-04-01 18:22:43 -04: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
Ty-Omaha
64362f2d3b start_now 2019-03-30 10:34:03 -04:00
Mark van Alphen
c370e08233 Port the actual Lavaland map (and associated fixes) 2019-03-30 04:12:37 +01:00
Mark van Alphen
78e8ca9147 Fix EXTRA_SPACE_RUIN_LEVELS_* names 2019-03-29 17:38:46 +01:00
Mark van Alphen
1e2ff20683 Resolve startup issues: added missing configs, removed unused configs from example file and fix shuttle warning 2019-03-29 17:09:05 +01:00
Fox McCloud
d0ea5ee8b9 Crit Rework Final Submission 2019-03-28 17:28:00 -04:00
joep van der velden
9631eef2aa Fixed the middle mouse exploit 2019-03-18 14:53:41 +01:00
AffectedArc07
6ab0344bb6 Config option for the paranoid 2019-03-03 11:37:49 +00:00
variableundefined
943a21a776 Merge pull request #10818 from datlo/freegolems
Port Mineral golems and Free Golems
2019-02-11 20:37:07 +08:00
Alffd
42832fb8ee Revert "Added a configuration option for disabling subsystems by name" 2019-02-09 00:17:40 -05:00
variableundefined
ce02ed22f6 Merge pull request #10740 from AffectedArc07/discord-link-notify
Discord linking and roundstart notifications!
2019-02-09 10:55:20 +08:00
variableundefined
a658db8f45 Merge pull request #10781 from MINIMAN10000/subsystem-configuration
Added a configuration option for disabling subsystems by name
2019-02-09 10:45:08 +08:00
datlo
2f24f9639f Set default prob to 75%, also fix typos
oof
2019-02-04 13:23:17 +00:00
datlo
0358bfef42 fix bugs, remove cult free golems 2019-02-04 13:11:11 +00:00
datlo
74a3631741 compilin and mostly workin
has runtimes due to body color
need to wrap up commented procs
2019-02-03 06:40:50 +00:00
Alffd
110d3b17b4 Revert "Discord Bot Functionality" 2019-01-30 21:19:33 -05:00
MINIMAN10000
050d520aa7 Added configuration for disabling subsystems by name 2019-01-30 01:51:48 -08:00
variableundefined
e13a536ddc Merge pull request #10585 from v0idp/discord_bot
Discord Bot Functionality
2019-01-29 10:43:51 +08:00
AffectedArc07
3b75eaaba3 Adds a round notify system 2019-01-26 21:23:10 +00: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
void*
ee20733f74 made all changes wanted for PR 2019-01-07 01:40:00 +01:00
void*
8b8cfdaadb Reworked discord interface to replace the IRC one completely 2019-01-06 18:00:28 +01:00
void*
a179ffd83d Added Discord Bot functionality 2019-01-03 18:11:15 +01:00
joep van der velden
b332cda61d Made the round start time variable using the config.txt 2018-10-28 20:24:56 +01:00
Crazy Lemon
fb5247b045 Merge pull request #9413 from Ty-Omaha/button
Adds a Discord button & stylizes the Karma Shop and Donate buttons
2018-09-29 17:48:48 -07:00
shazbot194
3ddbcfdc18 Adds a small description to custom sprites 2018-09-16 14:18:56 -08:00