cee64d5c37
Merge remote-tracking branch 'upstream/master' into diagonal-movement
2019-07-08 10:13:15 -04:00
49059b5317
Merge pull request #11619 from Tayyyyyyy/scrolling_messages
...
Add scrolling to messages window, bug fix
2019-07-08 20:23:37 +08:00
a7b4e0b9ef
Merge remote-tracking branch 'upstream/master' into diagonal-movement
2019-07-07 22:17:19 -04:00
df199a651d
Merge pull request #11663 from Markolie/maskofnarsie
...
Remove traces of the Mask of Nar'Sie
2019-07-07 22:10:02 +08:00
33d35eb625
Merge branch 'master' into diagonal-movement
2019-07-02 05:55:44 -04:00
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
118db59f61
autonote for manual bans finally
2019-06-17 09:07:10 -04:00
3105895293
Fix players showing as DCed when not
2019-06-10 00:59:47 -07:00
3b24d495a3
Add scrolling messages
2019-06-10 00:26:14 -07:00
2dd6dcfb55
Remove traces of the Mask of Nar'Sie
2019-06-03 06:33:43 +02:00
5979166f54
Merge remote-tracking branch 'upstream/master' into diagonal-movement
2019-06-02 21:59:58 -04:00
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
2c1ccf6786
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
...
# Conflicts:
# paradise.dme
2019-05-31 05:48:49 +02:00
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
6fe42d596d
squash hour macro changes
2019-05-30 17:49:19 -07:00
65f73b9a8c
reverts use of HOURS macro until I can find a way that works
2019-05-30 17:46:16 -07:00
fef59b4772
crazylemon comments
2019-05-30 17:40:18 -07:00
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
eaeea7ce2f
adds forum link, removes boxen discord table
2019-05-29 14:56:28 -07:00
3662b90265
fix, 'more info' for admins, better whitelist support, pre-client bans
2019-05-28 11:35:53 -07:00
fe68c74466
Merge branch 'master' into diagonal-movement
2019-05-22 14:24:54 -04:00
0e3645a27d
taketickets
2019-05-19 14:24:12 -04:00
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
41b175f470
Merge pull request #11480 from Tayyyyyyy/messages_window
...
Make it easier to slide into DMs
2019-05-17 19:20:22 +08:00
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
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
e9a382a6f2
show if ckey is whitelisted before removing them
2019-05-10 19:14:51 -07:00
fe7a9e5702
Removes the verb interface to SDQL2 to reduce the attack surface of admins
2019-05-10 15:11:14 -07:00
1b0defba92
fixes merge conflict
2019-05-10 09:56:58 -07:00
f4de59a4f8
adds whitelist functionality
2019-05-10 09:54:20 -07:00
8131b3976c
Fix style
2019-05-09 10:29:32 -07:00
510c210930
Merge
2019-05-09 17:06:35 +01:00
27e4ca3d19
Animate typing indicator
2019-05-08 12:47:37 -07:00
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
e5c2dfe535
Add typing indicator
2019-05-08 11:37:55 -07:00
8161196627
Allow admins to force open conversation
2019-05-08 09:48:50 -07:00
a6045d14ad
Highlight active tab
2019-05-07 16:43:11 -07:00
fcc4216ccd
Add unread indicator
2019-05-06 20:36:42 -07:00
c669d642d4
Add archiving and admin buttons
2019-05-06 19:32:17 -07:00
a127f00b5a
Add h4 tag to make things blue
2019-05-06 18:12:32 -07:00
5b5e0a86a1
Add messages window
2019-05-06 12:13:58 -07:00
0c85b1790c
fixes merge conflict in paradise.dme
2019-05-04 22:59:00 -07:00
fb619648a9
Resolve conflicts
2019-05-03 22:28:04 -04:00
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
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
bbeb07abd2
More lighting fixes
2019-05-04 03:06:10 +02:00
5357e0e36f
Merge pull request #11428 from Markolie/bundles
...
Chameleon overhaul
2019-05-04 08:23:40 +08:00
6e79364b65
Here we go again
2019-05-03 21:47:07 +08:00
63980ff522
switches from flags=f to flags=b, for <130ms response time
2019-05-02 17:41:23 -07:00
b27f084eb8
Admin created cultists can now properly summon their Gods
...
Upon being made a cultist through admin means, the "summon spots" will now be generated, even if the game mode isn't cult. This allows admin created cultists to actually reach their goal of summoning their god, if it is what the admins told them to do.
2019-05-02 15:35:40 +02:00
Couls