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

902 Commits

Author SHA1 Message Date
Mark van Alphen
cd362d6bad Wormhole jaunter fix (and replace lighting checks with simulated) and disk compartmentalizer fix 2019-06-03 21:44:01 +02: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
variableundefined
e8d13fec44 Merge pull request #11524 from Fox-McCloud/the-end 
The End
 2019-05-27 19:45:51 +08: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
16c352abd1 Merge pull request #11472 from Couls/code-phrase 
Remove non-manifest names from the code phrases
 2019-05-17 19:17:01 +08: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
AffectedArc07
510c210930 Merge 2019-05-09 17:06:35 +01:00
Mark van Alphen
443fa06c31 Update our getFlatIcon() code to /tg/'s latest 2019-05-09 02:01:26 +02: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
Couls
087869ab5c Remove non-manifest names from the code phrases 2019-05-06 00:33:24 -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
e9d39b0d27 Chameleon overhaul 2019-05-01 20:59:41 +02:00
AffectedArc07
bdc5452609 Globalise this 2019-04-30 21:12:09 +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
variableundefined
d2750dd33e Merge pull request #11404 from farie82/popup-limiter-fix 
Fixes some edge cases for the popup limiting
 2019-04-29 22:29:33 +08:00
joep van der velden
0f034f0443 Fixes some edge cases for the popup limiting 2019-04-29 15:53:51 +02: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
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
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
563a951975 SSevents & SSholiday 2019-04-23 10:55:36 +01:00
Mark van Alphen
211468b24f Add fake ambient occlusion 2019-04-21 01:45:30 +02:00
Mark van Alphen
09da967bd1 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	_maps/map_files/RandomZLevels/moonoutpost19.dmm
#	_maps/map_files/cyberiad/cyberiad.dmm
 2019-04-18 03:15:52 +02:00
variableundefined
31a2779bae Merge pull request #11259 from Markolie/flukeops 
Nuke Ops updates and buffs
 2019-04-18 07:16:31 +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
Crazy Lemon
1a57f440df Merge pull request #11257 from Fox-McCloud/nations-update 
The Nations Update Everyone Deserves!
 2019-04-09 20:47:34 -07:00
Mark van Alphen
f63b587f54 Nuke ops updates 2019-04-07 21:57:22 +02:00
variableundefined
525b28014c Merge pull request #11026 from farie82/popup-limiting 
Gives the option to limit the text popups to 1
 2019-04-07 20:41:24 +08:00
Fox McCloud
8446632fbc The Nations Update Everyone Deserves! 2019-04-06 20:30:04 -04:00
CornMyCob
e02087d474 blood drunk miner 2019-04-04 20:34:26 +01:00
Mark van Alphen
500675be77 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	code/game/objects/structures/safe.dm
 2019-04-02 00:54:49 +02:00
Fox McCloud
0b06a32cc9 Merge pull request #11165 from Markolie/issues 
Resolve some issues that the compiler doesn't spot
 2019-04-01 18:22:43 -04:00
Mark van Alphen
55adce2fb1 Fix code review issues 2019-03-31 22:09:09 +02:00
Mark van Alphen
1619bc048b Lavaland baseturf implementation 2019-03-31 22:07:30 +02:00
Mark van Alphen
45a066c7d1 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	code/modules/food_and_drinks/recipes/recipes_grill.dm
 2019-03-30 22:55:09 +01:00
Mark van Alphen
f0dab66ebc Further turf updates, add Necropolis/boss turfs 2019-03-30 01:24:03 +01:00
Mark van Alphen
fb337f2825 Port over Lavaland mobs and turfs (not finished) 2019-03-29 23:45:36 +01:00
Mark van Alphen
b8e840c094 Resolve some issues that the compiler doesn't spot 2019-03-29 16:21:15 +01:00
Fox McCloud
122c17a006 oh no fox lost it 2019-03-19 18:23:04 -04:00
Fox McCloud
277722508a [Goonchem] Reagent Temperature 2019-03-18 20:06:15 -04:00
variableundefined
024a393fe9 Merge pull request #11057 from farie82/no-more-force-on-dview 
Should make it so that dview can not bump into alive people anymore
 2019-03-17 22:11:50 +08:00
joep van der velden
675ef68422 uses move resist now 2019-03-17 14:41:31 +01:00
joep van der velden
9eef7fe1f7 no fastmos for the dview 2019-03-17 13:48:16 +01:00
joep van der velden
288f52bbaf added the canmove 2019-03-17 11:34:05 +01:00
joep van der velden
34cdc1dceb removes the force movement of dview 2019-03-17 11:25:02 +01:00
AffectedArc07
ce34a6ccb1 Merge branch 'master' into prisonconsole-fixed 2019-03-16 17:54:31 +00:00