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 and GitHub
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 and GitHub
33d35eb625
Merge branch 'master' into diagonal-movement
2019-07-02 05:55:44 -04:00
variableundefined and GitHub
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 and GitHub
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 and GitHub
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 and GitHub
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
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
ec790efeaa
SSticker
2019-04-30 16:47:47 +01: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
Couls
7eb7d723f9
Implement keybinding system and remove old hotkey modes
2019-04-23 01:31:03 -04:00
Fox McCloud and GitHub
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
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 and GitHub
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
Mark van Alphen
f94796c125
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
...
# Conflicts:
# code/game/objects/items.dm
# icons/turf/floors/plating.dmi
# paradise.dme
2019-04-10 21:54:54 +02:00
Arkatos1
5edc1378f8
New tips, renamed show tip verb, new Random Tip verb
2019-04-05 14:43:38 +02:00
Mark van Alphen
99c470531f
Add Swarmer megafauna/ruin, refactor medals so it's a subsystem. The catwalk's not yet functional
2019-04-04 17:43:15 +02:00
Arkatos1
51c91337c2
Adds show tip admin verb and Tip of the round
2019-04-04 15:37:07 +02:00
Couls