Crazy Lemon
01c41cfb86
Merge pull request #6081 from Markolie/lavaland_megafauna
...
Ports Lavaland megafauna
2017-02-05 00:27:40 -08:00
Brian McGillivray
23139987a0
Tweak: Mr Chang's vending machine now refillable
...
Changed the Mr Chang's vending machine to be able to be refiled with a
new Chinese vending refill canister crate that can be ordered by Cargo.
2017-02-02 15:49:27 +00:00
Markolie
b55394ace3
Fix resource identifiers
2017-01-31 17:45:46 +01:00
Markolie
ab4703623c
Review changes
2017-01-27 17:46:38 +01:00
Markolie
d6276ae978
Tiger's comments
2017-01-22 19:15:26 +01:00
Markolie
a50a3d59b9
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna
...
# Conflicts:
# code/__DEFINES/is_helpers.dm
# code/_globalvars/lists/objects.dm
# code/game/machinery/turrets.dm
# config/example/config.txt
# goon/browserassets/css/browserOutput.css
# icons/obj/library.dmi
# icons/turf/floors.dmi
2017-01-20 23:43:35 +01:00
Mieszko Jędrzejczak
1b506aaf9f
Switches over to the new system
2017-01-17 13:57:07 +01: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
Crazy Lemon
f1c3a7cd13
Merge pull request #6085 from Fox-McCloud/food-rework
...
Food rework
2017-01-10 12:11:17 -08:00
Markolie
0adc370d55
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna
...
# Conflicts:
# code/game/machinery/turrets.dm
2017-01-09 22:00:31 +01:00
Fox McCloud
9f40d013f9
Merge pull request #6099 from Kyep/offer_control_improvements
...
Add playtime option to "offer control to ghosts"
2017-01-09 07:19:50 -05:00
Crazylemon64
ade630f864
Tightens the permissions on debug, DI panel, view variables
2017-01-08 22:51:38 -08:00
Kyep
d088aacaf1
Switches from being days based to playtime based
2017-01-07 17:59:36 -08:00
Kyep
65205ce4ca
Merge remote-tracking branch 'ParadiseSS13/master' into offer_control_improvements
2017-01-07 17:33:39 -08:00
Markolie
e2c60c2bdb
Add shapeshift spell, human_req/nonabstract_req support and make Ashdrake reward a shapeshift.
2017-01-06 17:02:38 +01: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
Aurorablade
113f2770e3
somethingsomethingcaffine
2017-01-06 06:33:12 -05:00
Aurorablade
7fb084d690
tries to address comments...
...
and will get them wrong.
2017-01-05 22:07:21 -05: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
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
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
Crazylemon64
339a187f9f
Fixes vision updates such as implants and similar
2016-12-21 17:59:08 -08:00
Crazylemon64
c0cd2c263f
Switches reset_view to reset_perspective
2016-12-21 17:59:08 -08:00
Crazylemon64
6d3e66f41c
Polishes up the reset_view proc, which is basically
...
`reset_perspective` from tgstation.
Also adds various support for remote viewing lenses - like cameras not
transmitting xray vision, among other things
Recommit because we're using different compiler versions
2016-12-21 17:56:57 -08:00
TullyBurnalot
51a47b37b0
- 180 Reverse, Mines now banned from surplus
2016-12-20 10:09:38 +00:00
Aurorablade
c5e6c9323b
addresses mrrowl comments
...
still haveing shuttle load issues after first one is loaded..
2016-12-11 23:11:21 -05:00
Kyep
9de53dfd1c
Adds "Min Days" option to VV->Offer Control To Ghosts
2016-12-11 03:14:16 -08:00
Fox-McCloud
7a55ec18fc
Merge remote-tracking branch 'upstream/master' into food-rework
2016-12-05 12:40:32 -05:00
Aurorablade
2dc1a48f35
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into DWI
2016-12-01 22:38:35 -05:00
Aurorablade
fa1aa894ea
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub
2016-12-01 18:04:07 -05:00
Fox-McCloud
a1b8205fdd
food
2016-11-29 08:45:46 -05:00
Fox-McCloud
e134100164
Hunger Rework
2016-11-28 13:17:46 -05:00
KasparoVy
e06218371f
Sharper character creation preview images, tails/body accessories now show up in ID photos.
2016-11-25 17:55:57 -05:00
Aurorablade
5d392b36a4
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub
2016-11-15 15:30:36 -05:00
KasparoVy
fae398ae42
Replaces \blue and \red with spans, removes unnecessary SRCs and :s, Fixes Negative Cable Coil Bug
2016-11-13 18:16:37 -05:00
Markolie
fec0bb3ca9
Only disable fireball if it was successfully cast
2016-11-11 21:38:45 +01: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
Fox McCloud
f67bccb444
Merge pull request #5764 from Markolie/teg2
...
TEG refactor
2016-10-30 19:56:26 -04:00
TheDZD
eb21043b9a
Merge pull request #5815 from Fox-McCloud/food-refactor
...
Food refactor
2016-10-28 22:37:19 -04:00
Markolie
662c04a08c
Disable fireball after using it
2016-10-26 18:36:01 +02:00
Markolie
0fa43f7f41
Hopefully final magic fixes, and fixes the possessor
2016-10-25 23:32:35 +02:00
Fox-McCloud
7ca1330749
further tweaks
2016-10-25 16:46:41 -04:00
Markolie
61daab92f2
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna
...
# Conflicts:
# code/modules/mob/living/carbon/human/appearance.dm
2016-10-25 18:31:39 +02:00
Markolie
dbc73875d7
Fix spells, shadow/Diona QoL improvements (HUD icons)
2016-10-25 18:11:09 +02:00
Aurorablade
0a265f963c
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub
2016-10-24 22:30:16 -04: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
Markolie
f61cfb47b9
Part three: The Hierophant. Also minor fixes for the other bosses.
2016-10-24 21:39:40 +02:00
