cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-27 10:41:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
44,949 Commits 26 Branches 2 Tags
d02165e0f94de2c4a9399a8699cc355da4f8a329
Commit Graph

1342 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
Mark van Alphen
1619bc048b Lavaland baseturf implementation 2019-03-31 22:07:30 +02:00
joep van der velden
3804de1f3b STAFF!!! 2019-03-10 09:05:06 +01:00
joep van der velden
842615cd5b Fixed an ahelp follow up bug. Works now 2019-03-09 22:20:19 +01:00
joep van der velden
8d6cee7915 in between 2019-03-09 20:57:59 +01:00
datlo
91792b09c1 Prevent objectives from targetting offstation roles 
also remove nukie flavor text and prevent golem targetting
 2019-02-16 15:09:25 +00:00
datlo
b538a52da5 Prevent ERT/Abductors/ETC from stealing the NAD 2019-02-11 13:09:56 +00:00
Fox McCloud
f9aa125eb5 Merge pull request #10796 from Citinited/sexy-clowns-oh-god 
Repaths sexy clown stuff to be subtypes of the existing clown items
 2019-02-01 17:48:18 -05:00
Citinited
41ac5e0027 Repath of sexy clown gear: part 1 2019-02-01 21:46:58 +00:00
variableundefined
21cc9d882f Merge pull request #10680 from Aurorablade/EXTERMINATUSPARTONE 
I JUST CONFLICTED EVERYTHING
 2019-01-31 11:03:33 +08:00
Alffd
110d3b17b4 Revert "Discord Bot Functionality" 2019-01-30 21:19:33 -05:00
Aurorablade
d3448cf287 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into EXTERMINATUSPARTONE 2019-01-29 17:42:39 -05:00
variableundefined
e13a536ddc Merge pull request #10585 from v0idp/discord_bot 
Discord Bot Functionality
 2019-01-29 10:43:51 +08:00
variableundefined
70ddb65f29 Merge pull request #9287 from Citinited/funny-chemicals 
Adds a new clown chemical 🤡
 2019-01-28 06:11:38 +08:00
Kyep
69b902503e Fixes admin co-ord jump 2019-01-26 18:40:53 -08:00
Citinited
4913f343ed Adds jestosterone component 2019-01-26 13:21:02 +00:00
datlo
6b43fae248 Add dusting implant 2019-01-21 13:24:06 +00:00
datlo
e15e68e32e adds hud 2019-01-20 18:08:53 +00:00