cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-09 17:13:36 +00:00
Code Issues Packages Projects Releases Wiki Activity
47,428 Commits 26 Branches 2 Tags
cd23b41b20ce569ff42d4fbff00a789bdb3b9729
Commit Graph

233 Commits

Author SHA1 Message Date
Fox McCloud
affa319fab Removes Console Screens (#12512) 2019-10-08 21:07:50 -04:00
SteelSlayer
e9d463576f Reaper cult sprite overhaul (#12513) 2019-10-08 20:55:16 -04:00
variableundefined
3ae71f7932 Merge pull request #12245 from Fox-McCloud/universal-damage 
Universal Object Damage
 2019-10-06 23:22:48 -04:00
Fox McCloud
9e03f75a4b I-carry-onward 2019-10-06 00:26:03 -04:00
TDSSS
b58d3998e8 Fixes beach visual bugs (#12487) 2019-10-03 08:28:57 -04:00
Fox McCloud
9097dfcacf Merge remote-tracking branch 'upstream/master' into universal-damage 
# Conflicts:
#	code/game/machinery/machinery.dm
#	code/game/objects/items.dm
#	code/game/objects/structures.dm
#	code/game/objects/structures/inflatable.dm
#	code/game/objects/structures/mirror.dm
#	code/modules/clothing/spacesuits/hardsuit.dm
#	code/modules/clothing/suits/wiz_robe.dm
#	code/modules/mob/living/carbon/alien/alien_defense.dm
#	code/modules/mob/living/carbon/slime/slime.dm
#	code/modules/mob/living/simple_animal/friendly/slime.dm
 2019-09-28 00:16:11 -04:00
Fox McCloud
652920ae3c Wizard Battlemage Armor (#12388) 2019-09-24 15:42:47 -07:00
Fox McCloud
62226851d9 Merge remote-tracking branch 'upstream/master' into universal-damage 2019-09-23 12:53:52 -04:00
Fox McCloud
efc79cfc7c Removes Bodyscanner Console (#12377) 2019-09-22 21:11:02 -07:00
Fox McCloud
184e4877e8 the-gates-of-hell-shall-not-prevail 2019-09-16 02:07:57 -04:00
variableundefined
18b270cb7e Remove the structure/chair/wood/normal subtype, moving all properties to its parent. 2019-09-11 00:28:27 -04:00
Fox McCloud
fde5769225 other vending machines 2019-09-08 10:59:04 -04:00
Fox McCloud
92411d7a02 Merge pull request #11853 from Kyep/ts_gateway_fix 
Terror Spider Fixes & Tweaks
 2019-09-08 03:51:59 -04:00
Fox McCloud
dca6d98f5f Refactors Corgis 2019-09-04 18:40:34 -04:00
Kyep
0102aff057 fixes merge conflict 2019-09-03 19:10:19 -07:00
Fox McCloud
1a5c25603e mapping is a pain 2019-08-27 18:32:28 -04:00
Fox McCloud
1b10495f7d fix 2019-08-27 18:08:43 -04:00
Kyep
20ad4888b9 Merge remote-tracking branch 'ParadiseSS13/master' into ts_gateway_fix 2019-08-25 19:56:35 -07:00
Fox McCloud
cb6df7092c Hardsuit Helmets Integration 2019-08-24 18:36:27 -04:00
Kyep
3f50b2b4b3 code quality: TRUE/FALSE 
squash
 2019-08-22 03:41:43 -07: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
90a2406ada Moon Outpost 19 mirror fix 2019-06-12 23:35:01 +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
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