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
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
Kyep
0c85b1790c
fixes merge conflict in paradise.dme
2019-05-04 22:59:00 -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
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
Kyep
63980ff522
switches from flags=f to flags=b, for <130ms response time
2019-05-02 17:41:23 -07:00
Eman
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
Mark van Alphen
e9d39b0d27
Chameleon overhaul
2019-05-01 20:59:41 +02:00
AffectedArc07
acf43fac3a
V2
2019-04-30 19:19:18 +01: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
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
Couls
a8db26df98
Merge remote-tracking branch 'upstream/master' into diagonal-movement
2019-04-25 23:45:08 -04:00
Mark van Alphen
ccef4d1187
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
...
# Conflicts:
# icons/mob/actions/actions.dmi
# paradise.dme
2019-04-24 02:55:32 +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
Couls
7eb7d723f9
Implement keybinding system and remove old hotkey modes
2019-04-23 01:31:03 -04: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
Fox McCloud
4761ded0d4
Merge pull request #11350 from AffectedArc07/ss-everything
...
Gives the orphans a home
2019-04-21 18:44:38 -04:00
Mark van Alphen
7fef96e38d
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
...
# Conflicts:
# paradise.dme
2019-04-21 23:27:23 +02: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
Mark van Alphen
6faf9c769f
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
...
# Conflicts:
# code/modules/mob/living/simple_animal/friendly/farm_animals.dm
# paradise.dme
2019-04-17 22:46:43 +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
