cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-28 03:01:37 +00:00
Code Issues Packages Projects Releases Wiki Activity
45,921 Commits 26 Branches 2 Tags
6b2add6eb9cff51637c73ef1bbe9ccd0598aaa98
Commit Graph

1374 Commits

Author SHA1 Message Date
Fox McCloud
cb6df7092c Hardsuit Helmets Integration 2019-08-24 18:36:27 -04:00
variableundefined
5daf9a190b Merge pull request #11712 from Markolie/lazy 
Custom outfit manager and spawn with outfit on transform/reincarnate
 2019-08-24 12:27:48 -04:00
Fox McCloud
e4ca25be3d Merge pull request #11998 from Tayyyyyyy/pm_window_links 
Add links to ping and open conversation in window for PMs
 2019-08-21 01:49:03 -04:00
Fox McCloud
5d9fc8e9ea Merge pull request #11985 from Tayyyyyyy/admin_pencode 
Add admin pencode: style, class, and img
 2019-08-14 22:22:34 -04:00
Tayyyyyyy
534a4ce3b9 Add links to ping and open conversation in window for PMs 2019-08-12 23:31:23 -07:00
Tayyyyyyy
f17798d95b FIx more garbled quotes 2019-08-12 22:08:08 -07:00
Tayyyyyyy
48c002b361 Add admin pencode: style, class, and img 2019-08-12 09:47:59 -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
variableundefined
0b469ce563 Merge pull request #11577 from farie82/mhelp-take 
Ticket take now asks for a confirmation if it's already assigned + ticket/PM code refactor
 2019-08-12 17:44:26 +08:00
Tayyyyyyy
90bbc01cf4 Fix input sanitization issues 2019-08-11 22:40:16 -07:00
Fox McCloud
fcc137500a Merge pull request #11919 from florkeger/freeze-name-fix 
Updated admin freeze text
 2019-08-11 17:08:19 -04:00
farie82
d6f6029147 Merge branch 'master' into afk-list 2019-07-28 23:43:37 +02: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
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
Mark van Alphen
6c58f9fcbb Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lazy 
# Conflicts:
#	paradise.dme
 2019-07-08 19:37:54 +02: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
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
joep van der velden
1c8bdb0d7a Adds a list SSD players verb for admins 2019-06-16 11:33:57 +02: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
Mark van Alphen
ef16165471 More outfit fixes 2019-06-09 23:27:06 +02:00
Mark van Alphen
8234881a2a New custom outfit managers, select equipment refactor and spawn with outfit on transform/reincarnate 2019-06-09 21:46:41 +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
Couls
fe68c74466 Merge branch 'master' into diagonal-movement 2019-05-22 14:24:54 -04:00
joep van der velden
0f9742071a ticket and PM changed 2019-05-22 18:59:50 +02: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
Crazylemon64
fe7a9e5702 Removes the verb interface to SDQL2 to reduce the attack surface of admins 2019-05-10 15:11:14 -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
tayyyyyyy
c669d642d4 Add archiving and admin buttons 2019-05-06 19:32:17 -07:00
tayyyyyyy
a127f00b5a Add h4 tag to make things blue 2019-05-06 18:12:32 -07:00
tayyyyyyy
5b5e0a86a1 Add messages window 2019-05-06 12:13:58 -07:00
Couls
fb619648a9 Resolve conflicts 2019-05-03 22:28:04 -04:00
Mark van Alphen
d98eb14a39 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	code/__DEFINES/misc.dm
#	code/modules/mob/living/simple_animal/hostile/hostile.dm
#	code/modules/mob/living/simple_animal/hostile/mining_mobs.dm
#	code/modules/shuttle/shuttle.dm
#	icons/mob/actions/actions.dmi
#	paradise.dme
 2019-05-04 03:16:38 +02:00
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