cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-25 17:51:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
44,451 Commits 26 Branches 2 Tags
b5c322e00a2449b441ffb573f4c50135d0842e60
Commit Graph

2428 Commits

Author SHA1 Message Date
Mark van Alphen
f3fb39b339 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lighting 
# Conflicts:
#	code/__DEFINES/misc.dm
 2019-05-04 03:07:36 +02:00
Mark van Alphen
bbeb07abd2 More lighting fixes 2019-05-04 03:06:10 +02:00
variableundefined
5357e0e36f Merge pull request #11428 from Markolie/bundles 
Chameleon overhaul
 2019-05-04 08:23:40 +08:00
variableundefined
6e79364b65 Here we go again 2019-05-03 21:47:07 +08:00
Mark van Alphen
e9d39b0d27 Chameleon overhaul 2019-05-01 20:59:41 +02:00
variableundefined
32376093cb Merge pull request #11393 from Fox-McCloud/powernet-refactor 
TG Powernet Refactor
 2019-04-30 12:42:53 +08:00
Fox McCloud
7b57d2e319 fixups 2019-04-29 04:41:31 -04:00
joep van der velden
efcfbbcf2d Added checks now 2019-04-28 00:08:03 +02:00
joep van der velden
86c8cf0c8b PM's work again 2019-04-27 22:25:04 +02:00
variableundefined
905fc7607a Merge pull request #11328 from farie82/mhelp-rights-fix 
Admins can now see the mhelp tickets
 2019-04-23 20:46:34 +08:00
Fox McCloud
4761ded0d4 Merge pull request #11350 from AffectedArc07/ss-everything 
Gives the orphans a home
 2019-04-21 18:44:38 -04:00
AffectedArc07
ff78ff1a9c SScommunications 2019-04-21 20:12:14 +01:00
AffectedArc07
c16762c257 Kills air killing 2019-04-19 16:23:35 +01:00
joep van der velden
89b0ffae6a Admins can now see the mhelp tickets 2019-04-19 14:31:46 +02:00
AffectedArc07
52dff88bd9 Die monster! You don't belong in this world! 2019-04-17 16:30:43 +01:00
variableundefined
eb83a2dee7 Merge pull request #11285 from Fox-McCloud/elecrocution-refactor 
Refactors Electrocution
 2019-04-16 19:47:42 +08:00
variableundefined
46d32bf052 Merge pull request #11298 from Kyep/ban_fix 
Fixes bans not saving properly
 2019-04-16 19:45:32 +08:00
variableundefined
dc825a7bfa Merge pull request #11231 from Arkatos1/Tips 
Adds Tip of the round + Show Custom Tip admin verb + Give Random Tip OOC verb
 2019-04-16 19:43:55 +08:00
Kyep
2726324dfa removes non-IP ban option for legacy bans, because DB bans won't honor it regardless 2019-04-13 12:51:34 -07:00
Kyep
35a58864e4 add ip/cid to db bans 2019-04-13 12:44:45 -07:00
Fox McCloud
90c9f3f479 Refacors Electrocution 2019-04-10 18:09:14 -04:00
farie82
9034f2a214 Merge branch 'master' into mhelp-ticket-system 2019-04-07 14:43:49 +02:00
variableundefined
86ea35c25b Merge pull request #11161 from Kyep/terrorspider_patch_post_newcrit 
Terror Spider tweaks
 2019-04-07 20:30:48 +08:00
Arkatos1
5edc1378f8 New tips, renamed show tip verb, new Random Tip verb 2019-04-05 14:43:38 +02:00
Arkatos1
51c91337c2 Adds show tip admin verb and Tip of the round 2019-04-04 15:37:07 +02:00
variableundefined
449baf808b Merge pull request #11170 from Fox-McCloud/trick-revolver 
Adds Trick Revolver
 2019-04-02 18:33:24 +08: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
Ty-Omaha
64362f2d3b start_now 2019-03-30 10:34:03 -04:00
Arkatos1
8669ea1716 Removed Dark Matter for real, improved descriptions and added Blob Overminds to Check Antagonists verb 2019-03-30 15:00:12 +01:00
Fox McCloud
41eb7c2476 adminbus 2019-03-30 05:15:47 -04:00
Mark van Alphen
b8e840c094 Resolve some issues that the compiler doesn't spot 2019-03-29 16:21:15 +01:00
Kyep
51c119660c add: shows admins details about growing eggs/spiders 2019-03-28 21:36:31 -07:00
joep van der velden
1131133d59 Confirmation 2019-03-17 10:17:39 +01:00
joep van der velden
3804de1f3b STAFF!!! 2019-03-10 09:05:06 +01:00
joep van der velden
af156a9eb8 made the my ticket verbs available for the normal players 2019-03-09 23:31:32 +01:00
joep van der velden
f9d01f396c Updated the closing permissions and added a new message for the closing of mhelps 2019-03-09 23:20:16 +01:00
joep van der velden
842615cd5b Fixed an ahelp follow up bug. Works now 2019-03-09 22:20:19 +01:00
joep van der velden
8d6cee7915 in between 2019-03-09 20:57:59 +01:00
Kyep
57d9b22675 Eventmob/specialrole v1.0 2019-03-08 02:08:24 -08:00
datlo
91792b09c1 Prevent objectives from targetting offstation roles 
also remove nukie flavor text and prevent golem targetting
 2019-02-16 15:09:25 +00:00
variableundefined
d1ce7e6085 Merge pull request #10879 from datlo/stationdisk 
Prevent ERT/Abductors/Traders/etc from stealing dat disk
 2019-02-14 21:37:47 +08:00
datlo
b538a52da5 Prevent ERT/Abductors/ETC from stealing the NAD 2019-02-11 13:09:56 +00:00
AffectedArc07
40ba27b871 Adds an admin panel to force unlnik discord accounts 2019-02-10 12:21:30 +00:00
Kyep
00187ad971 Updates show player playtime report 2019-02-01 23:46:29 -08:00
Fox McCloud
f9aa125eb5 Merge pull request #10796 from Citinited/sexy-clowns-oh-god 
Repaths sexy clown stuff to be subtypes of the existing clown items
 2019-02-01 17:48:18 -05:00
Citinited
41ac5e0027 Repath of sexy clown gear: part 1 2019-02-01 21:46:58 +00:00
variableundefined
21cc9d882f Merge pull request #10680 from Aurorablade/EXTERMINATUSPARTONE 
I JUST CONFLICTED EVERYTHING
 2019-01-31 11:03:33 +08:00
Alffd
110d3b17b4 Revert "Discord Bot Functionality" 2019-01-30 21:19:33 -05:00
Aurorablade
d3448cf287 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into EXTERMINATUSPARTONE 2019-01-29 17:42:39 -05:00