cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-16 00:26:56 +01:00
Code Issues Packages Projects Releases Wiki Activity
45,921 Commits 17 Branches 2 Tags
6b2add6eb9cff51637c73ef1bbe9ccd0598aaa98
Commit Graph
344 Commits
Author SHA1 Message Date
Fox McCloud 4c6651fa72 fixes 2019-08-24 20:13:09 -04:00
Fox McCloud cb6df7092c Hardsuit Helmets Integration 2019-08-24 18:36:27 -04:00
Fox McCloudandGitHub b3423eac2f Merge pull request #11984 from Markolie/ruinsport 
Netherworld portal fix and butler pick time increase
 2019-08-14 20:02:29 -04:00
Mark van Alphen 709163ee8c Increase butler pick time, fix destruction of netherworld portal 2019-08-12 00:41:06 +02:00
variableundefinedandGitHub 9eff8a8663 Merge pull request #11696 from Markolie/shuttlechairs 
Add shuttle chairs (and fix newlines on all maps)
 2019-08-11 16:32:14 +08:00
Mark van Alphen 2ae1fc7ac2 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into shuttlechairs 
# Conflicts:
#	icons/obj/chairs.dmi
 2019-08-09 23:41:07 +02:00
Mark van Alphen 14e8022daf Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into portalfix 
# Conflicts:
#	code/game/objects/effects/step_triggers.dm
 2019-08-09 23:38:49 +02:00
Mark van Alphen fd579015b1 Portal fixes - adds oldloc to Crossed() 2019-07-15 20:16:17 +02:00
Mark van Alphen f56854292a Add shuttle chairs (and fix newlines on all maps) 2019-06-07 03:39:24 +02:00
Mark van Alphen dd7da2140b Die of Fate fixes 2019-06-07 02:33:08 +02:00
Mark van Alphen ba3f65049d Port over remaining Lavaland ruins 2019-06-07 01:19:55 +02:00
Mark van Alphen 950a4cb5dc More portal fixes 2019-06-03 21:57:00 +02:00
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 2c4c378775 ChangeTurf icon fix 2019-06-03 03:25:48 +02:00
Mark van Alphen 6aba8f9e52 Address comments 2019-06-03 02:40:30 +02:00
Mark van Alphen 8822887784 Compile fix and asteroid turf placement fix 2019-06-03 01:21:03 +02:00
Mark van Alphen e7fa7fed34 Fix the Syndicate base causing atmos alerts 2019-06-03 00:52:14 +02:00
Mark van Alphen 81c325262d Fix Ash Walkers mining and antag selection, fix Lavaland Syndicate base incinerator buttons and comms agent mask 2019-06-02 01:18:18 +02:00
Mark van Alphen b57ba154ad Add ghostrole jobban option 2019-06-01 07:03:43 +02:00
Mark van Alphen 48cf33e53d Fix Syndicate base humans not spawning with pistols 2019-05-31 05:07:58 +02: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 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 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 bbeb07abd2 More lighting fixes 2019-05-04 03:06:10 +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 ec790efeaa SSticker 2019-04-30 16:47:47 +01:00
Mark van Alphen b410ee5a97 zvis fix 2019-04-26 23:13:13 +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
Fox McCloud 0034e851a1 Kills off Object and Fast Object Processes 2019-04-23 23:53:40 -04:00
Mark van Alphen 3285efd36c Final lighting updates 2019-04-22 22:43:21 +02:00
Mark van Alphen affae89028 Attempt update to /tg/ lighting system 2019-04-22 19:55:41 +02:00
Mark van Alphen 1619bc048b Lavaland baseturf implementation 2019-03-31 22:07:30 +02:00
Mark van Alphen a05b37c5ca General Lavaland fixes, add Hierophant ruin 2019-03-31 01:12:10 +01:00
Mark van Alphen f92be2c67d Add Beach biodome ruin and other fixes 2019-03-30 22:48:11 +01:00
Mark van Alphen f0dab66ebc Further turf updates, add Necropolis/boss turfs 2019-03-30 01:24:03 +01:00
datlo cc3a71a0fb fix span 
oof
 2019-02-12 18:37:39 +00:00
datlo 8b1f12183f added notice of adamantine leadership 2019-02-12 11:57:57 +00:00
datlo 0823650dbe add spawnability check to golems/old station/etc 2019-02-11 19:37:22 +00:00
variableundefinedandGitHub 943a21a776 Merge pull request #10818 from datlo/freegolems 
Port Mineral golems and Free Golems
 2019-02-11 20:37:07 +08:00
TDSSS 272a29f249 Never spellcast and drive, kids. 2019-02-09 03:00:25 +01:00
datlo 6898c542ef Implement golem coloring, minor tweaks 2019-02-05 01:43:09 +00:00
datlo 0358bfef42 fix bugs, remove cult free golems 2019-02-04 13:11:11 +00:00
datlo cf1a95dabc fix config options 2019-02-04 00:21:13 +00:00
datlo ca5543a637 implement golem subtype procs 2019-02-03 23:18:36 +00:00
datlo e566e90733 Add golem spawn rules 2019-02-03 17:08:51 +00:00
datlo 74a3631741 compilin and mostly workin 
has runtimes due to body color
need to wrap up commented procs
 2019-02-03 06:40:50 +00:00
datlo f98da3edf8 Progress... 2019-02-02 17:51:25 +00:00