cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-06-04 21:13:28 +01:00
Code Issues Packages Projects Releases Wiki Activity
45,414 Commits 15 Branches 2 Tags
940f87b210c311fdb5bbb5c00a17b68aad95eeea
Commit Graph

2503 Commits

Author SHA1 Message Date
Fox McCloud fcc137500a Merge pull request #11919 from florkeger/freeze-name-fix 
Updated admin freeze text
 2019-08-11 17:08:19 -04:00
variableundefined 0b04d71445 Merge pull request #11515 from Tayyyyyyy/sanitize 
Sanitize all inputs
 2019-08-11 22:09:10 +08:00
Kyep 977087a97e fixes merge conflict 2019-08-11 01:36:09 -07:00
kazboo 78d38ffea8 usr to admin 
changed the passed variable from usr to admin
 2019-07-25 03:17:26 +02:00
kazboo 6c7f4aeb9c Update admin freeze text 
This simple comit removes the admin ckey message that is shown to the player upon being frozen and only shows the character assigned to the admin.
 2019-07-25 03:08:15 +02:00
Crazy Lemon 0019ebc5f2 Merge pull request #11825 from Ty-Omaha/permaban 
Replaces "This is a permanent ban" with "This ban does not expire automatically and must be appealed."
 2019-07-15 19:18:49 -06:00
tayyyyyyy 57c700a814 Sanitize all inputs 2019-07-14 09:35:12 -07:00
Couls de5defa936 Diagonal tweaks 2019-07-12 06:00:19 -04:00
Ty-Omaha dd1a48e947 this stupid space who even made appealmessage have a space in it 2019-07-11 19:03:01 -04:00
Ty-Omaha eb3f70684d reword the reword 2019-07-11 18:42:03 -04:00
Ty-Omaha 73a7bff8b3 Permaban 2019-07-11 16:58:02 -04:00
Couls cee64d5c37 Merge remote-tracking branch 'upstream/master' into diagonal-movement 2019-07-08 10:13:15 -04:00
variableundefined 49059b5317 Merge pull request #11619 from Tayyyyyyy/scrolling_messages 
Add scrolling to messages window, bug fix
 2019-07-08 20:23:37 +08:00
Couls a7b4e0b9ef Merge remote-tracking branch 'upstream/master' into diagonal-movement 2019-07-07 22:17:19 -04:00
variableundefined df199a651d Merge pull request #11663 from Markolie/maskofnarsie 
Remove traces of the Mask of Nar'Sie
 2019-07-07 22:10:02 +08:00
Couls 33d35eb625 Merge branch 'master' into diagonal-movement 2019-07-02 05:55:44 -04:00
variableundefined 7ffce9acdf Merge pull request #11504 from Crazylemon64/sdql_verb_interface_remove 
Removes the verb interface to SDQL2
 2019-06-30 14:36:04 +08:00
Ty-Omaha 118db59f61 autonote for manual bans finally 2019-06-17 09:07:10 -04:00
tayyyyyyy 3105895293 Fix players showing as DCed when not 2019-06-10 00:59:47 -07:00
tayyyyyyy 3b24d495a3 Add scrolling messages 2019-06-10 00:26:14 -07:00
Kyep bde012431f hides attack logs involving NPCs, lavaland, adminroom, thunderdome 2019-06-06 19:46:07 -07:00
Mark van Alphen 2dd6dcfb55 Remove traces of the Mask of Nar'Sie 2019-06-03 06:33:43 +02:00
Couls 5979166f54 Merge remote-tracking branch 'upstream/master' into diagonal-movement 2019-06-02 21:59:58 -04:00
Mark van Alphen 81c325262d Fix Ash Walkers mining and antag selection, fix Lavaland Syndicate base incinerator buttons and comms agent mask 2019-06-02 01:18:18 +02: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 6fe42d596d squash hour macro changes 2019-05-30 17:49:19 -07:00
Kyep 65f73b9a8c reverts use of HOURS macro until I can find a way that works 2019-05-30 17:46:16 -07:00
Kyep fef59b4772 crazylemon comments 2019-05-30 17:40:18 -07:00
Mark van Alphen b65fbb907e Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	icons/obj/vending.dmi
#	paradise.dme
 2019-05-30 19:35:52 +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
Couls fe68c74466 Merge branch 'master' into diagonal-movement 2019-05-22 14:24:54 -04:00
Ty-Omaha 0e3645a27d taketickets 2019-05-19 14:24:12 -04:00
Mark van Alphen 2c5e216e82 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	icons/mob/actions/actions.dmi
#	icons/mob/inhands/items_lefthand.dmi
#	icons/mob/inhands/items_righthand.dmi
#	paradise.dme
 2019-05-17 17:37:18 +02:00
variableundefined 41b175f470 Merge pull request #11480 from Tayyyyyyy/messages_window 
Make it easier to slide into DMs
 2019-05-17 19:20:22 +08:00
variableundefined 719ffda09e Merge pull request #11438 from Emanthealmighty/AdminCultist-change 
Admin created cultists can now properly summon their Gods.
 2019-05-17 19:15:39 +08: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 e9a382a6f2 show if ckey is whitelisted before removing them 2019-05-10 19:14:51 -07:00
Crazylemon64 fe7a9e5702 Removes the verb interface to SDQL2 to reduce the attack surface of admins 2019-05-10 15:11:14 -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
tayyyyyyy 8131b3976c Fix style 2019-05-09 10:29:32 -07:00
AffectedArc07 510c210930 Merge 2019-05-09 17:06:35 +01:00
tayyyyyyy 27e4ca3d19 Animate typing indicator 2019-05-08 12:47:37 -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
tayyyyyyy e5c2dfe535 Add typing indicator 2019-05-08 11:37:55 -07:00
tayyyyyyy 8161196627 Allow admins to force open conversation 2019-05-08 09:48:50 -07:00
tayyyyyyy a6045d14ad Highlight active tab 2019-05-07 16:43:11 -07:00
tayyyyyyy fcc4216ccd Add unread indicator 2019-05-06 20:36:42 -07:00