cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-18 13:32:37 +00:00
Code Issues Packages Projects Releases Wiki Activity
46,875 Commits 27 Branches 2 Tags
1c05fb85e6ff92569f0796bf4ea984068fbaffc2
Commit Graph

135 Commits

Author SHA1 Message Date
Fox McCloud
386e270122 DNA Vault Rework (#12455) 2019-10-08 21:33:43 -04:00
Fox McCloud
67dc33ac3f for-the-strength-from-which-he-gives-is-unerring 2019-10-05 02:08:11 -04:00
Fox McCloud
d29be05f74 the-figment-that-was-is-now-gone 2019-10-01 19:08:15 -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
farie82
0e8ddb2afe Refactors the examine proc to return a list of strings (#12280) 2019-09-25 22:05:01 -07:00
Fox McCloud
af92373d33 though-this-world-may-be-broken 2019-09-15 05:53:43 -04:00
Fox McCloud
8587f63982 Refactors Spawners/Tendrils 2019-09-07 20:02:53 -04:00
variableundefined
c59006ec5f Merge pull request #12004 from datlo/golemtweaks 
Mineral golems fixes and features
 2019-08-28 07:59:43 -04:00
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 McCloud
b3423eac2f Merge pull request #11984 from Markolie/ruinsport 
Netherworld portal fix and butler pick time increase
 2019-08-14 20:02:29 -04:00
datlo
49dd72888a Mineral golems fixes and features 
- Add ashstorm immunity to titanium and plastitanium golems
- Add lava immunity to plastitanium golems
- Fix uranium golems so they irradiate nearby mobs properly
- Bananium golems now waddle. Slowly.
- Tranquillite golems now properly get their mime powers.
 2019-08-14 10:29:17 +02:00
Mark van Alphen
709163ee8c Increase butler pick time, fix destruction of netherworld portal 2019-08-12 00:41:06 +02:00
variableundefined
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
e7fa7fed34 Fix the Syndicate base causing atmos alerts 2019-06-03 00:52:14 +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
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
Mark van Alphen
3285efd36c Final lighting updates 2019-04-22 22:43:21 +02:00
Mark van Alphen
1619bc048b Lavaland baseturf implementation 2019-03-31 22:07:30 +02: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
variableundefined
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
Aurorablade
afc6ad524f DMI File Casing Rename 2019-01-30 20:09:39 -05:00
Aurorablade
b812736517 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into EXTERMINATUSPARTONE 2019-01-19 23:35:15 -05:00
Aurorablade
86d2a1634c Casing correction 1 2018-12-17 00:07:37 -05:00
Kyep
4427d02acd researchnotes, pills, injector runtime 2018-12-09 00:41:11 -08:00
Gwydion Brain
3aa11b1923 itsa me, the space-a bar 2018-11-03 20:57:09 -08:00
Gwydion Brain
ccfbe5f205 Shoes and Goo, hah get it? It's ointment 2018-11-03 17:05:25 -07:00
Gwydion Brain
00b48e43c6 Sprite additions 2018-10-28 23:39:15 -07:00
Purpose
716b89ec6a fixes aluminum & cleans some unnecessary variables 2018-10-20 09:59:52 +01:00
Purpose
47e814cf51 Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into space-ruin-number-one 2018-10-19 10:47:57 +01:00