cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-31 04:31:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
48,685 Commits 26 Branches 2 Tags
06ef8c94de23b2be6576f61ef4c3c70fea3a82e6
Commit Graph

230 Commits

Author SHA1 Message Date
AffectedArc07
14dc4d1e2b Removes ToR Ban 2020-07-30 13:09:15 +01:00
AffectedArc07
390e41e91d The elephant: Ruin + Whiteship rework (#13632) 
* The elephant: Ruin + Whiteship rework

* ROUND TWO: FIGHT

* Forgot this

* Kyet Fixes

* [NEEDS TESTING] Tweaks from new knowledge

* Adds to Meta, Removes from Delta

* This isnt needed anymore

* Adds in one empty space level

* Area tweaks
 2020-07-12 13:44:58 -06:00
ZomgPonies
ed91723d63 Fixed db version in dbconfig example file 2020-05-21 16:32:17 -04:00
AffectedArc07
8fdc0a6245 Adds a permission to only view runtimes (#13072) 
* Adds a permission to only view runtimes

* It would appear I am half asleep

* Almost failed my own CI tests there. good job AA
 2020-03-25 16:15:18 -06:00
Patrick Meade
54f538307c Panic bunker threshold is configurable (#13080) 
* Panic bunker threshold is configurable

* Cleaned up bunker automation logic, added admin control verb

* Changed Set Server Capacity to two toggle verbs; modified logic

* Revert "Changed Set Server Capacity to two toggle verbs; modified logic"

This reverts commit 398a8615a5.

* Revert "Cleaned up bunker automation logic, added admin control verb"

This reverts commit b6a6d49714.
 2020-03-12 01:24:16 -06:00
variableundefined
691fc34941 Merge pull request #12920 from ppi13/patch-2 
Fixes Unknown game mode probability
 2020-02-15 23:06:26 -05:00
Kyep
3479297bdc db version 11 2020-01-29 23:29:08 -08:00
ppi13
a4a79c485b Fixes Unknown game mode probability 2020-01-23 23:58:28 +01:00
Kyep
1504b78ba2 Merge remote-tracking branch 'ParadiseSS13/master' into forum_integration_improvement 2020-01-06 19:28:51 -08:00
Kyep
7acb902388 SQL update: track playtime per player per day for stats 2019-12-15 16:48:16 -08:00
Kyep
1361305bf9 Updates links for new domain 2019-12-04 21:37:10 -08:00
Kyep
db82363bfb Adds forum-based link config setting 2019-11-13 20:41:28 -08:00
Kyep
a0081713f3 Adds web playerinfo link 2019-11-02 18:51:59 -07:00
Coul
1cd674b2b8 Merge remote-tracking branch 'upstream/master' into too-many-monkeys-jumping-on-the-bed 2019-09-15 10:46:27 -04:00
Coul
00c3b6ad41 limit the amount of monkeys spawned from monkey cubes 2019-09-14 21:18:45 -04:00
variableundefined
7c88842f5f Add a config option that makes gamemode respect required_players number. It defaults to no. 2019-09-08 12:22:31 -04:00
datlo
9ec6c795d1 Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into add-biodomes 2019-08-27 11:02:49 +02:00
datlo
28caad13f9 add winter/clown biodomes 2019-08-18 21:06:58 +02:00
AffectedArc07
bdc4bba6ac Add back parallax SQL changes 2019-08-14 17:53:15 -07:00
variableundefined
635db54625 Merge pull request #11730 from farie82/afk-list 
Adds a list AFK players verb for admins
 2019-08-12 17:48:33 +08:00
datlo
d329f04ae6 Merge branch 'master' into lavalandgolemsintospace 2019-08-11 16:12:28 +02:00
Fox McCloud
3bd3e96eaa Merge pull request #11695 from Markolie/ruinsport 
Port over remaining Lavaland ruins
 2019-08-09 17:08:38 -04:00
farie82
d6f6029147 Merge branch 'master' into afk-list 2019-07-28 23:43:37 +02:00
Mark van Alphen
88fa0d27df Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into ruinsport 
# Conflicts:
#	paradise.dme
 2019-07-15 20:30:54 +02:00
farie82
4cfe0c8152 Merge branch 'master' into AFK-subsystem 2019-07-12 16:42:02 +02:00
joep van der velden
da047887f6 DB update 2019-07-12 16:41:04 +02:00
variableundefined
52ae3bb933 Merge pull request #11674 from DoctorDrugs/Additional-Miners 
Adds additional roundstart miner slots
 2019-07-12 18:16:32 +08:00
Couls
362566222c SQL changes 2019-07-11 17:02:52 -04:00
joep van der velden
0b23dab1f0 Added the afk subsystem. Will automatically handle AFK players 2019-06-16 20:54:09 +02:00
joep van der velden
1c8bdb0d7a Adds a list SSD players verb for admins 2019-06-16 11:33:57 +02:00
Mark van Alphen
8955e3388f Blacklist update 2019-06-09 23:03:18 +02:00
DoctorDrugs
901225f0db Dropped miners from 8 to 6 at round start 2019-06-05 17:21:37 -04:00
DoctorDrugs
8b173a9955 Adds additional roundstart miner slots 
adds additional roundstart miner slots and all the equipment they need
 2019-06-04 01:26:09 -04:00
Couls
5979166f54 Merge remote-tracking branch 'upstream/master' into diagonal-movement 2019-06-02 21:59:58 -04:00
datlo
32812736ee Integrate free golems as a lavaland ruin 2019-05-31 09:30:03 +01:00
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