cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-24 08:22:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
45,921 Commits 29 Branches 2 Tags
6b2add6eb9cff51637c73ef1bbe9ccd0598aaa98
Commit Graph

209 Commits

Author SHA1 Message Date
Kyep
1b0defba92 fixes merge conflict 2019-05-10 09:56:58 -07:00
AffectedArc07
510c210930 Merge 2019-05-09 17:06:35 +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
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
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
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
c8d890ef8a Merge pull request #11365 from Kyep/id_card_tracking 
Upgrades ID Computer
 2019-04-30 13:28:03 +08:00
Kyep
97e53916f6 job transfers now correctly update job slots 2019-04-29 20:10:06 -07:00
Citinited
9976ad9ea1 Adds airlock spawners 2019-04-27 21:41:36 +01:00
Fox McCloud
d0a077f9d5 Powernet Refactor 2019-04-27 02:06:04 -04:00
Mark van Alphen
40c1a25eb5 Lighting fixes 2019-04-27 01:08:17 +02:00
Mark van Alphen
4423962a2a Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	code/controllers/subsystem/mapping.dm
#	paradise.dme
 2019-04-26 23:07:57 +02:00
Mark van Alphen
e4dd9110ee Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lighting 
# Conflicts:
#	paradise.dme
 2019-04-26 22:58:56 +02:00
Couls
5903ad2dfd Implement AZERTY and numpad targetting options 2019-04-26 03:33:29 -04:00
Couls
a8db26df98 Merge remote-tracking branch 'upstream/master' into diagonal-movement 2019-04-25 23:45:08 -04:00
Kyep
6d0d7ae506 fix centcom computers, add crew transfer log feature 2019-04-24 15:43:08 -07:00
Fox McCloud
5bdbb64da2 returning parent value 2019-04-24 01:11:42 -04:00
Kyep
3ef424eb5c upgrades ID computer 2019-04-23 21:02:27 -07:00
Fox McCloud
0034e851a1 Kills off Object and Fast Object Processes 2019-04-23 23:53:40 -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
AffectedArc07
fa6ba7343f Merge branch 'master' into ss-alarms 2019-04-23 20:37:42 +01:00
AffectedArc07
42624fe847 Spaces > Tabs 2019-04-23 20:31:26 +01:00
Fox McCloud
5bd258c560 Merge pull request #11360 from AffectedArc07/ss-events 
SSevents & SSholiday
 2019-04-23 14:25:56 -04: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
AffectedArc07
acee1dcb42 SSalarms 2019-04-23 12:45:35 +01:00
AffectedArc07
563a951975 SSevents & SSholiday 2019-04-23 10:55:36 +01:00
Couls
7eb7d723f9 Implement keybinding system and remove old hotkey modes 2019-04-23 01:31:03 -04:00
Kyep
4561ee94f8 WIP ports XKeyScore from TG 2019-04-22 16:53:20 -07:00
Mark van Alphen
affae89028 Attempt update to /tg/ lighting system 2019-04-22 19:55:41 +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
AffectedArc07
a0581c314a SSvote 2019-04-21 16:34:11 +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