cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-13 02:52:03 +00:00
Code Issues Packages Projects Releases Wiki Activity
45,213 Commits 27 Branches 2 Tags
d3dbbb6bb16038a5146f34b5ae1f2fcbd8e71ff4
Commit Graph

835 Commits

Author SHA1 Message Date
Couls
e8352f576b QoL adjustments 
F2 F3 F4 buttons have been restored
when numpad targetting is off you can use numpad 1-4 to change intents
pressing shift before any of the intent buttons doesn't change intents(for people with shift+1-4 macros)
backspace now sets the focus to the chat bar
 2019-07-12 18:09:37 -04:00
Couls
a7b4e0b9ef Merge remote-tracking branch 'upstream/master' into diagonal-movement 2019-07-07 22:17:19 -04:00
variableundefined
c2bd18e4fd Merge pull request #11639 from datlo/antagexploitfix 
Fix an antag rolling exploit
 2019-07-07 20:27:59 +08:00
Couls
33d35eb625 Merge branch 'master' into diagonal-movement 2019-07-02 05:55:44 -04:00
variableundefined
8c87fbb557 Merge pull request #11681 from Couls/keyphrase-fix 
Fixes empty words in syndicate keyphrases
 2019-06-28 21:40:47 +08:00
Couls
e3a19841d9 Merge remote-tracking branch 'upstream/master' into diagonal-movement 2019-06-22 03:54:43 -04:00
Mark van Alphen
5aa20721ba Prevent ruins from spawning on the Labor Camp and *very* close to the station 2019-06-05 03:16:55 +02:00
Couls
5e77dee146 Update ticker.dm 2019-06-04 18:50:34 -04:00
Mark van Alphen
6fb65958ed Make Gutlunches and Gubbucks reproduce properly 2019-06-04 00:11:52 +02:00
Couls
5979166f54 Merge remote-tracking branch 'upstream/master' into diagonal-movement 2019-06-02 21:59:58 -04:00
datlo
4c95169977 Fix an antag rolling exploit 2019-06-01 23:13:13 +01:00
Mark van Alphen
2c1ccf6786 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	paradise.dme
 2019-05-31 05:48:49 +02:00
Crazy Lemon
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
Mark van Alphen
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
Kyep
eaeea7ce2f adds forum link, removes boxen discord table 2019-05-29 14:56:28 -07:00
Kyep
3662b90265 fix, 'more info' for admins, better whitelist support, pre-client bans 2019-05-28 11:35:53 -07:00
variableundefined
86ecd0f8b0 Merge pull request #11584 from Markolie/ghastlytransition 
Re-add ghost space transitions, add ghost-z level tracking
 2019-05-28 11:28:34 +08:00
variableundefined
e8d13fec44 Merge pull request #11524 from Fox-McCloud/the-end 
The End
 2019-05-27 19:45:51 +08:00
Mark van Alphen
8fed0ac75c Re-add ghost space transitions, add ghost z level registering 2019-05-23 19:35:35 +02:00
Couls
fe68c74466 Merge branch 'master' into diagonal-movement 2019-05-22 14:24:54 -04:00
Ty-Omaha
94afabee9c fix2 2019-05-19 15:13:00 -04:00
Ty-Omaha
0a65713126 fix 2019-05-19 14:54:03 -04:00
Ty-Omaha
0e3645a27d taketickets 2019-05-19 14:24:12 -04:00
Fox McCloud
68effd9d83 The End 2019-05-13 17:22:57 -04: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
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
AffectedArc07
510c210930 Merge 2019-05-09 17:06:35 +01:00
AffectedArc07
531201fab4 Merge branch 'master' into hooks-part4 2019-05-08 22:21:12 +01: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
Fox McCloud
79815eb042 Merge pull request #11357 from Markolie/lighting 
Lighting system update
 2019-05-08 00:27:16 -04:00
AffectedArc07
014d803eba Merge branch 'master' into hooks-part4 2019-05-07 21:22:59 +01:00
Fox McCloud
4ec43eff59 Merge pull request #11455 from AffectedArc07/why 
while(TRUE) removes a while(TRUE) loop
 2019-05-07 16:12:55 -04:00
AffectedArc07
19d8efef68 Morgue Updating [Hooks P4] 2019-05-06 10:08:28 +01:00
AffectedArc07
f2bcd204bc Fixes captains displaycase [Hooks P3] 2019-05-05 22:31:24 +01:00
AffectedArc07
96edeacec5 Removes unused hooks 2019-05-05 10:28:56 +01:00
AffectedArc07
7da1ca12f3 This is why you dont bedcode 2019-05-05 10:06:02 +01:00
Kyep
0c85b1790c fixes merge conflict in paradise.dme 2019-05-04 22:59:00 -07:00
Kyep
932232545b INIT_ORDER_XKEYSCORE 2019-05-04 22:44:12 -07:00
AffectedArc07
f37cfe498d Removes something god awful 2019-05-04 09:37:22 +01:00
Fox McCloud
9b00e11628 Fixes Warning Spam for Mob Transitions and Roundstart Spawning 2019-05-03 23:08:36 -04:00
Couls
fb619648a9 Resolve conflicts 2019-05-03 22:28:04 -04:00
Mark van Alphen
bdfb4af5c2 Starlight fixes 2019-05-04 03:38:21 +02: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
4c99f3913b Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lighting 
# Conflicts:
#	paradise.dme
 2019-05-03 20:31:41 +02:00
variableundefined
6e79364b65 Here we go again 2019-05-03 21:47:07 +08:00
AffectedArc07
bdc5452609 Globalise this 2019-04-30 21:12:09 +01: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
Mark van Alphen
ad2238f496 Merge branch 'master' into lighting 2019-04-30 19:15:58 +02:00