cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-31 07:57:47 +01:00
Code Issues Packages Projects Releases Wiki Activity
46,971 Commits 15 Branches 2 Tags
4353b47cf5fc2d30d3a5e72ea8a7cb95977df4a5
Commit Graph
457 Commits
Author SHA1 Message Date
Fox McCloudandvariableundefined cc151278d5 Removes Unfinished VR (#12341) 2019-09-20 17:58:41 -07:00
Kyepandvariableundefined dfd83d822a Depot Fixes & Tweaks (#11677) 
* Depot Fixes & Tweaks
 2019-09-16 22:55:54 -04:00
datlo 068b997eb6 Final 
Add cabin area to avoid the alarm locking the entire biodome
Prevent crowbarring lubed tiles in clown planet
Added a few walls to prevent the disposal entrance immediately throwing
you into lava
 2019-08-27 14:34:27 +02:00
Tayyyyyyy e49d77b953 Update shuttle directions 2019-08-19 21:29:25 -07:00
Tayyyyyyy 4fa093fb2c Improve shuttle parallax stopping 2019-08-19 21:29:13 -07:00
AffectedArc07andTayyyyyyy cd57a4605e P A R A L L A X 2019-08-13 16:32:31 -07:00
datloandGitHub d329f04ae6 Merge branch 'master' into lavalandgolemsintospace 2019-08-11 16:12:28 +02:00
Kyep 977087a97e fixes merge conflict 2019-08-11 01:36:09 -07:00
joep van der velden f94fe59f1c specify the rooms to be non cryo. Not brute force it 2019-06-23 19:57:20 +02:00
joep van der velden 8f4379925b blacklist security, logging, Z level, antags blacklist, restrained/unconcious 2019-06-17 23:25:42 +02:00
datlo 8894d88a82 Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into lavalandgolemsintospace 2019-06-13 13:58:56 +01:00
Kyep bde012431f hides attack logs involving NPCs, lavaland, adminroom, thunderdome 2019-06-06 19:46:07 -07:00
Mark van Alphen e7fa7fed34 Fix the Syndicate base causing atmos alerts 2019-06-03 00:52:14 +02:00
datlo ade8aeaf2f Allow free golems to purchase shuttle board 
also add a shuttle recalls console to ruin
 2019-06-01 11:51:35 +01:00
datlo 32812736ee Integrate free golems as a lavaland ruin 2019-05-31 09:30:03 +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 McCloudandGitHub 79815eb042 Merge pull request #11357 from Markolie/lighting 
Lighting system update
 2019-05-08 00:27:16 -04:00
AffectedArc07 96edeacec5 Removes unused hooks 2019-05-05 10:28:56 +01:00
Mark van Alphen 6d8ec82733 Fix dynamic lighting on shuttles 2019-05-04 05:51:13 +02:00
Mark van Alphen bdfb4af5c2 Starlight fixes 2019-05-04 03:38:21 +02:00
Mark van Alphen bbeb07abd2 More lighting fixes 2019-05-04 03:06:10 +02:00
Mark van Alphen 35b1cee88b Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	icons/obj/toy.dmi
 2019-05-03 18:31:45 +02:00
Mark van Alphen d646ab0934 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lighting 
# Conflicts:
#	code/game/area/Space Station 13 areas.dm
 2019-05-03 18:30:07 +02:00
EvadableMoxie 5c2608330c Adds Nanotrasen Hospital ship, admin shuttle templates system. 2019-05-02 20:17:50 -04: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 84140d75a0 Merge branch 'lighting' of https://github.com/Markolie/Paradise into lighting 2019-04-30 19:17:41 +02:00
Mark van Alphen 4ad9fd4d18 Correct value 2019-04-30 19:17:34 +02:00
Mark van Alphen e2cf2782af Re-add fast_despawn 2019-04-30 19:16:44 +02:00
Mark van AlphenandGitHub ad2238f496 Merge branch 'master' into lighting 2019-04-30 19:15:58 +02:00
variableundefinedandGitHub 5b98e861f0 Merge pull request #11299 from Kyep/ssd_auto_cryo_option 
Better SSD management
 2019-04-30 11:29:49 +08: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 acee1dcb42 SSalarms 2019-04-23 12:45:35 +01:00
Mark van Alphen 3285efd36c Final lighting updates 2019-04-22 22:43:21 +02:00
Mark van Alphen 75b06fe82c Lighting fixes 2019-04-22 21:47:08 +02:00
Mark van Alphen d66d0e3203 Area invisibility fix 2019-04-22 21:06:33 +02:00
Mark van Alphen fb41731772 0 --> FALSE 2019-04-22 20:10:54 +02:00
Mark van Alphen 2ce1d37086 Move some stray area defines to the proper location 2019-04-22 19:57:47 +02:00
Mark van Alphen affae89028 Attempt update to /tg/ lighting system 2019-04-22 19:55:41 +02:00
Mark van Alphen 211468b24f Add fake ambient occlusion 2019-04-21 01:45:30 +02:00
Mark van Alphen d9be6c5a1a Code review changes 2019-04-19 19:12:21 +02:00
Kyep 77992d9292 ignore offstation, fast despawn for perma/solitary/brigcells 2019-04-13 14:30:19 -07:00
Mark van Alphen bf68f966b1 Add Ash Walkers, work on Syndicate base 2019-03-31 04:33:39 +02:00
Mark van Alphen f92be2c67d Add Beach biodome ruin and other fixes 2019-03-30 22:48:11 +01:00
Mark van Alphen c370e08233 Port the actual Lavaland map (and associated fixes) 2019-03-30 04:12:37 +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
datlo b538a52da5 Prevent ERT/Abductors/ETC from stealing the NAD 2019-02-11 13:09:56 +00:00
datlo 4ca61d45de Update vendor items, update map for botany/xenobio 2019-02-04 02:10:40 +00:00