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
Fox McCloud
68dfbf6217
Merge pull request #6131 from Crazylemon64/robot_module_actions
...
Robot module actions
2017-01-11 08:50:50 -05:00
Crazylemon64
a852d3f314
Fixes a garrote runtime
2017-01-10 18:28:40 -08:00
Crazy Lemon
f1c3a7cd13
Merge pull request #6085 from Fox-McCloud/food-rework
...
Food rework
2017-01-10 12:11:17 -08:00
Crazylemon64
36b967c93b
Fully rips out cyborg sight modules
2017-01-10 00:32:11 -08:00
Crazylemon64
131978db2d
Borgs now actually have their module actions revoked upon module removal
2017-01-10 00:18:46 -08: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
Crazylemon64
ec0f13d41e
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub
2017-01-06 05:01:43 -08:00
Crazylemon64
ac612d4924
Fixes construction talisman
...
Fixes supply talisman
2017-01-06 04:32:59 -08: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
Crazylemon64
f954382619
Adds a ui_key arg to ui_data
2016-12-31 12:51:07 -08: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
Fox McCloud
5a01a6c7d3
Merge pull request #5840 from Crazylemon64/adds_reset_perspective
...
Polishes up `reset_view`
2016-12-23 07:27:36 -05:00
Crazylemon64
4b1915a02f
Adds the advanced camera console tweak
2016-12-21 18:07:06 -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
Fox McCloud
398c3dce34
Merge pull request #5986 from tigercat2000/nano_patch_25
...
NanoUI Update: Seperate UI Data into ui_data() proc
2016-12-21 13:22:10 -05:00
TullyBurnalot
51a47b37b0
- 180 Reverse, Mines now banned from surplus
2016-12-20 10:09:38 +00:00
TullyBurnalot
e9f4209188
Proximity Mines now work for everyone
...
- Buttons are buttons
2016-12-19 01:09:34 +00:00
Tigercat2000
b9abce843d
NanoUI Update: Seperate UI Data into ui_data() proc
...
This commit changes how NanoUI's live data updating system works.
Previously, data for the template was directly gathered in the
ui_interact proc. Now, it is seperated into the proc `ui_data`.
To players, this does absolutely nothing.
To coders, this opens up the potential for a much more complicated and
fancy graphical updating system in the future, because the data is
available on-demand without ever having to call
nanomanager.try_update_ui.
2016-12-14 13:37:34 -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
Crazylemon64
e212308cac
The RCD making doors no longer has a shallow copy
...
This means that changing accesses on the RCD will no longer
change accesses made on prior doors
2016-11-28 02:25:05 -08:00
Crazy Lemon
b769147449
Merge pull request #5897 from FlattestGuitar/e20
...
e20 gets logged now
2016-11-23 13:22:16 -08:00
Aurorablade
0c637cebfa
Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into BookClub
2016-11-22 01:48:56 -05:00
Crazy Lemon
405fe1bb54
Merge pull request #5842 from Fox-McCloud/reagent-reorganization
...
Reagent Reorganization
2016-11-21 16:54:41 -08:00
Mieszko Jędrzejczak
7874bba921
e20 get logged
2016-11-20 01:42:22 +01:00
KasparoVy
0b23981f1b
Fix.
...
The spawnable DNA Injectors containing powers (XRay, etc.) will now
activate/deactivate the powers correctly.
2016-11-19 18:29:43 -05:00
Aurorablade
5d392b36a4
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub
2016-11-15 15:30:36 -05:00
TheDZD
9807576359
Merge pull request #5875 from Fox-McCloud/vision-fix
...
Fixes Simple Mobs Attacking Pods/Mechs Across Z-Levels
2016-11-13 19:52:24 -05:00
Fox-McCloud
55ffd16db8
Fixes Telekinetic Simple Mobs
2016-11-11 10:39:50 -05:00
Aurorablade
4b717c7712
BUILDABLE cult door...
2016-11-10 02:44:21 -05:00
Crazylemon64
6ec712df8c
Fixes defib leaving people in deadchat, n2o paralyse time
2016-11-06 21:36:24 -08:00
Fox-McCloud
61da53cca1
create reagents proc
2016-11-06 14:37:47 -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
Markolie
a77b501ebf
Runtime fix
2016-10-27 15:03:07 +02:00
Markolie
4dcb46d295
More minor briefcase changes
2016-10-27 15:00:31 +02:00
Markolie
e9dc5b1b1f
Fix secure briefcases appearing empty
2016-10-27 14:56:58 +02: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
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
Fox McCloud
5fb35e7b23
Merge pull request #5809 from Markolie/idchecks
...
Fix up a number of ID checks
2016-10-24 15:52:01 -04:00
