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

210 Commits

Author SHA1 Message Date
Mark van Alphen
ba3f65049d Port over remaining Lavaland ruins 2019-06-07 01:19:55 +02:00
Mark van Alphen
eb9ff99542 Another path fix 2019-06-06 01:36:29 +02:00
Mark van Alphen
2171f97ed7 Path fix 2019-06-06 01:35:58 +02:00
Mark van Alphen
fad735142b Water tile fixes and other minor fancy turf fixes 2019-06-06 00:09:19 +02:00
Mark van Alphen
94eb652f15 Fix alarms triggering on non-contact levels, spectral blade ghost fix, assigning outfits runtime fix 2019-06-03 17:39:23 +02:00
Mark van Alphen
650383aad1 ChangeTurf fix, incinerator starts off by default, Syndicate base fix 2019-06-03 05:53:56 +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
Mark van Alphen
e9a9326db0 Re-add starlight 2019-05-04 04:22:45 +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
variableundefined
5357e0e36f Merge pull request #11428 from Markolie/bundles 
Chameleon overhaul
 2019-05-04 08:23:40 +08:00
variableundefined
6e79364b65 Here we go again 2019-05-03 21:47:07 +08:00
Mark van Alphen
e9d39b0d27 Chameleon overhaul 2019-05-01 20:59:41 +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
Mark van Alphen
b98c4dfde0 Fix shuttle plating/propulsion 2019-04-17 23:20:07 +02:00
Mark van Alphen
a21ec0f30b Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	code/modules/mob/living/simple_animal/hostile/hostile.dm
 2019-04-04 22:04:55 +02:00
Mark van Alphen
877cfc4d7d Refactor catwalks to not be floors, update chasms and fix Lavaboat 2019-04-04 22:01:25 +02:00
lass9030
f5e60f4ed2 capitalization, fuck off 2019-04-02 19:44:12 +02:00
Mark van Alphen
c370e08233 Port the actual Lavaland map (and associated fixes) 2019-03-30 04:12:37 +01:00
Mark van Alphen
fb337f2825 Port over Lavaland mobs and turfs (not finished) 2019-03-29 23:45:36 +01:00
Fox McCloud
7d423acc61 Implements Newer Version of Mapmerge 2019-03-17 22:46:24 -04:00
AffectedArc07
433a22bb81 Mapmerge2-2 2019-03-03 01:02:32 +00:00
Kyep
a23c55a541 Eliminates 'range' var from door_controls, uses tags/zlevel instead 2019-01-29 18:13:23 -08:00
Kyep
6e0dad7aeb terror spider boss door button fixes 2019-01-29 17:33:43 -08:00
Kyep
4427d02acd researchnotes, pills, injector runtime 2018-12-09 00:41:11 -08:00
variableundefined
24ace06513 Merge pull request #10324 from granodd/ReagentScannerUpgrade 
The Old Mass Spectrometer is Dead, Long Live the Reagent Scanner
 2018-11-25 08:38:29 +08:00
Granodd
4b0cef8fb6 Fixes map conflicts. 2018-11-23 20:10:06 -05:00
TDSSS
96ae2f1696 Added hardsuit helmets and correct telecom components 2018-11-22 22:38:34 +01:00
variableundefined
9baf91fdfe Add baycard to map, loadout & datum. Replacing normal non-syndicate cards with them. 2018-10-31 17:12:43 +08:00
variableundefined
9dbd3445ab Merge pull request #9821 from SamHPurp/grime/dirt-away 
Away Missions dirt grime and decals
 2018-10-12 13:55:40 +08:00
Purpose
86811c8bae Away mission grime / dirt / decals 2018-10-12 00:05:48 +01:00
variableundefined
6b1b38d4f1 Port over tg ore stack and stack merging 
Meta

Birbfix

Maxi

Re-add automatic satchel ore pickup (oops)

Mecha formatting

re
 2018-10-09 10:06:03 +08:00
variableundefined
e5e13adeb1 Merge pull request #9759 from SamHPurp/space-hotel-decals 
Updates Decals on Space Hotel Away Mission
 2018-10-08 12:16:05 +08:00
variableundefined
4279b4efa1 Merge pull request #9761 from SamHPurp/terror-spiders-decals 
Updates Decals on Terror Spiders Away Mission
 2018-10-08 12:15:32 +08:00
variableundefined
92e781c3c3 Merge pull request #9764 from SamHPurp/space-battle-again 
Revert "Revert "Fixes Corpse Spawners & Adds Decal handling to Space Battle Away Mission""
 2018-10-08 10:15:30 +08:00
Purpose
0d7baab91d round two 2018-10-08 02:07:10 +01:00
Purpose
ed54a57baa terror spider decals 2018-10-08 01:55:22 +01:00
tigercat2000
be798623b4 Revert "Fixes Corpse Spawners & Adds Decal handling to Space Battle Away Mission" 2018-10-07 17:45:24 -07:00
variableundefined
d9be23e035 Merge pull request #9758 from SamHPurp/updates-spacebattle 
Fixes Corpse Spawners & Adds Decal handling to Space Battle Away Mission
 2018-10-08 08:41:34 +08:00
variableundefined
b342d01f7a Merge pull request #9756 from SamHPurp/moonoutpost19-decals 
Updates Decals on MoonOutpost19 Away Mission
 2018-10-08 08:36:07 +08:00
Purpose
de9fd5dd57 space hotel decals 2018-10-08 01:35:01 +01:00
Purpose
68eec9a5b6 updates space battle 2018-10-08 01:20:14 +01:00
variableundefined
2a397c8b01 Merge pull request #9733 from SamHPurp/blackmarketbackpackers-decals 
Updates Decals on Blackmarket Backpackers
 2018-10-08 07:57:56 +08:00
variableundefined
d21ed493d2 Merge pull request #9755 from SamHPurp/evil_santa-decals 
Updates Decals on Evil Santa Away Mission
 2018-10-08 07:54:11 +08:00
Purpose
9a3eb571c0 moon outpost 19 decals 2018-10-08 00:47:22 +01:00
Purpose
5aa923d6af evil santa decals 2018-10-08 00:28:24 +01:00
Purpose
f9e76e198d decals 2018-10-08 00:24:12 +01:00
Purpose
56d3d117f8 decals 2018-10-07 17:10:52 +01:00
Purpose
0bdf4408ce a few more /item/.... 2018-10-06 16:42:05 +01:00
Purpose
63dfd411aa Resolved merge conflicts... I hope. 2018-10-06 16:01:34 +01:00
Aurorablade
ce3ecee145 Port of TG ghost role spawner and Corpse Landmark refactor (#8211) 
Port of TG ghost role spawner and Corpse Landmark refactor
 2018-10-03 11:31:55 +08:00