Markolie
0aabf436db
Fix ion trail effect
2017-02-11 20:33:26 +01:00
Fox McCloud
04f5276047
Merge pull request #6350 from Markolie/lavaland_updates
...
Add remaining Lavaland loot, kinetic accelerator refactor
2017-02-11 00:02:42 -05:00
Fox-McCloud
0ebd41b05e
Fixes Slaughter Demon Bloodcrawl
2017-02-10 08:26:28 -05:00
Markolie
3298f7edce
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_updates
...
# Conflicts:
# icons/obj/objects.dmi
2017-02-08 19:25:47 +01:00
Fox-McCloud
dc15825102
Fixes Xeno Eggs and Projectiles
2017-02-07 07:27:43 -05:00
Markolie
1d6754728b
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_updates
...
# Conflicts:
# icons/mob/head.dmi
# icons/mob/suit.dmi
# icons/obj/clothing/hats.dmi
# icons/obj/clothing/suits.dmi
2017-02-06 20:37:03 +01:00
Markolie
7a4c33bbcd
Add meat hook, warp cube, wisp lantern, rename flashlight variable on weapons, add layer/inventory definitions
2017-02-06 19:55:37 +01:00
Markolie
2a23862c6a
Kinetic accelerator update, other fixes
2017-02-06 18:39:03 +01:00
Kyep
5d35de452a
Fixes conflict (rebase)
2017-02-06 04:09:15 -08:00
Kyep
b7590355b7
Fixes mines detonating when ghosts pass over them
2017-02-06 04:01:03 -08:00
Fox-McCloud
390f6768b3
Merge remote-tracking branch 'upstream/master' into botany-rework
2017-02-05 05:26:46 -05:00
Markolie
ab4703623c
Review changes
2017-01-27 17:46:38 +01:00
Fox-McCloud
084ed30446
more fixes and features
2017-01-25 01:04:01 -05:00
Markolie
d6276ae978
Tiger's comments
2017-01-22 19:15:26 +01:00
Fox-McCloud
706347fd84
even more work
2017-01-22 08:11:31 -05:00
Fox-McCloud
10c0e734c3
more work
2017-01-22 01:46:48 -05:00
Fox-McCloud
ea76990b7a
Botany Rework
2017-01-21 18:28:03 -05:00
Markolie
0c01bbdad1
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna
...
# Conflicts:
# code/game/gamemodes/cult/runes.dm
2017-01-12 16:24:26 +01:00
Aurorablade
5a07759c97
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into Bugsie
2017-01-11 23:41:06 -05:00
Markolie
f85e8fe551
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna
...
# Conflicts:
# code/modules/mob/living/carbon/human/species/station.dm
# icons/mob/screen_alert.dmi
2017-01-11 23:11:29 +01:00
Crazylemon64
66f2d40afa
Giant Spiders no longer clog up the Alien role channel
2017-01-09 13:38:34 -08:00
Aurorablade
155464b3a0
brain.exe had caused a critcal error and shut down
2017-01-07 01:03:46 -05:00
Aurorablade
0e35706c00
damn....
2017-01-06 23:32:17 -05:00
Markolie
f4c4bfe288
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna
...
# Conflicts:
# code/__HELPERS/unsorted.dm
# code/_globalvars/lists/objects.dm
# code/controllers/verbs.dm
# code/game/gamemodes/cult/ritual.dm
# code/game/gamemodes/cult/runes.dm
# code/game/objects/items/stacks/sheets/sheet_types.dm
# code/modules/mob/spirit/mask/mask.dm
# code/modules/mob/spirit/viewpoint.dm
# icons/effects/96x96.dmi
# icons/effects/effects.dmi
# icons/mob/actions.dmi
# icons/obj/weapons.dmi
# icons/obj/wizard.dmi
# icons/turf/floors.dmi
2017-01-06 16:36:46 +01:00
Markolie
8609157751
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna
...
# Conflicts:
# _maps/map_files/cyberiad/cyberiad.dmm
# code/_globalvars/mapping.dm
# code/game/objects/effects/landmarks.dm
2016-12-30 00:17:56 +01:00
Aurorablade
fc71122914
fixes
...
Barring any errent merge conflict fixing fuckery.
2016-12-29 11:39:18 -05:00
Aurorablade
98b7a89a17
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub
...
# Conflicts:
# code/game/machinery/doors/airlock.dm
2016-12-29 11:01:43 -05:00
Aurorablade
dd75048969
well hopefully last conflict fix with shuttle merger
2016-12-29 10:33:48 -05:00
Aurorablade
e25ddf8329
Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into DWI
2016-12-24 00:18:40 -05:00
Markolie
01f2c85347
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna
...
# Conflicts:
# code/__DEFINES/misc.dm
# code/game/dna/genes/goon_powers.dm
# code/game/dna/genes/vg_powers.dm
# code/game/objects/effects/overlays.dm
# code/game/objects/structures/crates_lockers/closets.dm
# code/game/objects/structures/crates_lockers/closets/statue.dm
# code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm
# icons/mob/back.dmi
# icons/obj/storage.dmi
2016-12-23 19:32:19 +01:00
Fox-McCloud
4b1bfe33ff
Wall Rot Effect Refactor
2016-12-14 13:12:10 -05:00
Aurorablade
0bb62ebb36
everything works thanks to our tiger overlords..
2016-12-12 23:59:37 -05:00
Kyep
49956eb241
Tiger request
2016-12-10 16:58:54 -08:00
Kyep
440d9fa3f2
Fixes xenomorph walls taking damage from disablers
2016-12-09 23:10:28 -08:00
Aurorablade
2dc1a48f35
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into DWI
2016-12-01 22:38:35 -05:00
Aurorablade
5d392b36a4
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub
2016-11-15 15:30:36 -05:00
Fox-McCloud
fcc20ac6bc
BSA Tweaks
2016-11-09 22:36:03 -05:00
Aurorablade
23e392f0ef
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub
2016-10-31 22:38:14 -04:00
Fox McCloud
911fa70e1a
Merge pull request #5601 from Crazylemon64/status_effect_overhaul
...
Ports over the status effect unification from the extreme refactor
2016-10-30 22:40:24 -04:00
Aurorablade
d4361171e5
EVERYONE OUT OF THE POOL
2016-10-29 23:43:28 -04:00
Fox McCloud
66027032a4
Merge pull request #5821 from Markolie/ertfixes
...
ERT fixes
2016-10-27 10:30:23 -04:00
Markolie
f27f72e61b
ERT fixes
2016-10-26 03:05:51 +02:00
Markolie
1c89bcb28e
Fix spiderling remains being draggable
2016-10-25 18:43:06 +02:00
Markolie
e5c4b78f47
Add Colossus, add outdoors variable to areas and update fireball targeting
2016-10-25 04:10:52 +02:00
Markolie
5ace926e42
Added Bubblegum. Added dismemberment chance to bullets, and made changes to GPS tracking.
2016-10-25 00:50:31 +02:00
Crazylemon64
6a7f7394a8
Ports over the status effect unification
2016-10-23 15:45:35 -07:00
Markolie
2e711d1337
Lay groundwork for megafauna, and add Ashdragon.
...
Includes a refactor for gun turrets (merged into portable turrets), hostile simple_animal behaviour, spells (sounds have been added) and poi_list items.
2016-10-23 23:15:57 +02:00
Aurorablade
2c104adaf3
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub
2016-09-01 00:43:50 -04:00
Aurorablade
65d1c781c8
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into DWI
2016-08-26 21:54:56 -04:00
Crazylemon64
16dd4e9d21
Moves many uses of log_to_dd to log_runtime, to make the output
...
more visible at runtime, to someone who isn't watching DD first-hand
2016-08-24 09:55:19 -07:00
