cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-08 16:41:58 +00:00
Code Issues Packages Projects Releases Wiki Activity
46,837 Commits 26 Branches 2 Tags
affa319fabd30e7a661dcbee6bc321f2a971f78e
Commit Graph

214 Commits

Author SHA1 Message Date
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
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
farie82
d6f6029147 Merge branch 'master' into afk-list 2019-07-28 23:43:37 +02: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
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
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
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
Mark van Alphen
0f98a95666 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	icons/mob/actions/actions.dmi
#	paradise.dme
 2019-05-13 22:14:38 +02: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
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
AffectedArc07
ec790efeaa SSticker 2019-04-30 16:47:47 +01: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
9bd40ef6f6 improves hub entry 2019-04-26 17:54:11 -07:00
Kyep
d61d8a3dc1 new feature: ssd warning system 2019-04-22 21:38:47 -07:00
Kyep
a35ba2fc5f spacing 2019-04-22 18:52:50 -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
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
Mark van Alphen
99c470531f Add Swarmer megafauna/ruin, refactor medals so it's a subsystem. The catwalk's not yet functional 2019-04-04 17:43:15 +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
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
datlo
2f24f9639f Set default prob to 75%, also fix typos 
oof
 2019-02-04 13:23:17 +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
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
Ty-Omaha
aee8c926dd spacing 2018-08-24 15:40:53 -04:00
Ty-Omaha
1a1882287d button stuff 2018-08-24 14:46:01 -04:00
Crazylemon64
1ba1a953b3 Adds extra configuration for space ruins, enables them by default 2018-08-04 14:39:54 -07:00