cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-26 10:12:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
58,079 Commits 26 Branches 2 Tags
82b863cefdabb64cb15e03dd7978006390c0f3be
Commit Graph

366 Commits

Author SHA1 Message Date
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
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