Commit Graph

550 Commits

Author SHA1 Message Date
25528b59c3 revert location changes + fix math in rads calc 2017-10-22 18:39:29 +01:00
faa26dfe5a remove diag_log, oops 2017-10-22 17:39:18 +01:00
a6aade38b9 disable geiger by default 2017-10-22 17:28:51 +01:00
a3ff403d2c change back 2017-10-22 17:18:52 +01:00
a7f5f1ea8f Merge branch 'experimental' of https://github.com/EpochModTeam/Epoch into experimental 2017-10-22 17:16:30 +01:00
e996d78695 Radioactive sickness calc 2017-10-22 17:15:58 +01:00
3e7a62560a cfglocations setVariable correction 2017-10-22 09:41:00 -05:00
02e4b822e4 conflicts 2017-10-22 00:10:45 +01:00
8b5f896424 Merge branch 'experimental' of https://github.com/EpochModTeam/Epoch into experimental 2017-10-21 23:52:37 +01:00
a893e7aa74 Geiger counter GUI release 2017-10-21 23:35:53 +01:00
0ff57e294e Variable handling of accelerated HTA loss 2017-10-21 16:41:31 -04:00
035ff7aa09 Added variable handling of accelerated HTA loss 2017-10-21 16:40:44 -04:00
414013497c increase loot bias for bunkers 2017-10-21 06:08:39 -05:00
2ce47c3a3f comment 2017-10-20 17:05:01 -05:00
ae581880a4 fix possible random var collisions 2017-10-20 17:04:32 -05:00
2d1835d455 SnapPoints for Floors 2017-10-20 23:15:17 +02:00
5427db38fe mapOnZoomSetMarkerSize upgrades to maintain preset size scaling
all markers now scaled based on sizing desired in the cfgMarkerSets.
Adjustment of 2.25 to the mapScale was added to achieve smaller markers sooner and maintain non cluttered map markers
2017-10-20 13:49:16 -05:00
6857111a02 remove comments, edit high value 2017-10-20 11:17:42 -05:00
9297fa539e onZoomMarkerScaling upgrade
use better mapScale value management and calculation
2017-10-20 11:15:09 -05:00
27ef146313 make use of config based snap points 2017-10-20 10:08:52 -05:00
760547789f item interaction fixes
Allow eating of all seeds
Fixed no effect from nanite injector, nanite cream, nanite pills, iodide
pills
Provide feedback when attempting to use morphine when you dont need it.

NOTE:
when using Default as parent class InteractAction defaults to ammo
repack = 0
interactActions 1,2 ,6,7,8,9 are all do the same thing via
_unifiedInteract function
2017-10-20 08:06:41 -05:00
2f6e0bf4c6 snapping corrections and direction lock for similar constructions
Add direction lock.
If direction lock it only allows 0 and 180 degrees adjustment.
Will force 90 to 180 an 270 to 0
This keeps all snaps in proper order during tests
2017-10-20 00:50:22 -05:00
17f396b51b player stats changes
logic to select low or high criticalAttributes
forced blood drop if player is hypothermic.
force blood pressure rise if toxicity or radiation is over 55
removed Radiation reduction in master loop so you can only reduce
radiation with treatments
players blood pressure must stay within 11-179 range or be killed.
2017-10-19 19:44:05 -05:00
7c43bc6e0d Trader Kill + BuildMode Keydown fixed 2017-10-19 20:45:41 +02:00
d2bdbcb5d6 updates for toilet and kitchen sink
kitchenSink positions can be added to kitchenSinkPos at any time and
should spawn without BE kicks.
2017-10-19 13:16:34 -05:00
184b2da59e remove unused code
added a compile for code sent from config entry, this need not apply anymore
2017-10-19 12:58:46 -05:00
b28ed47141 Fix for Marker 2017-10-19 19:22:44 +02:00
96f72fc98a Option to overwrite Marker Text
Added Option to overwrite marker text and use it for Service Points
2017-10-19 19:10:52 +02:00
4aa72d5a5d add config mapOnZoomSetMarkerSize 2017-10-19 11:30:42 -05:00
83363f693b added same change below for the counter to raise 2017-10-19 10:43:35 -05:00
8f4420f88d Update Event1.sqf
Only do the marker resizing of core Epoch mod markers since it causes issues with mission markers.

Also shrank the sizes a bit after discussion with @xDrokz
2017-10-19 11:27:30 -04:00
d92e0f65be Update EPOCH_fnc_createLocalMarkerSet.sqf
Added EPOCH_ to the name of all local Epoch markers
2017-10-19 11:23:14 -04:00
b2cf56a7b6 global marker sets and map upgrade
New global marker sets and functions.
Replace all markers for events and locations(fully configurable in CfgMarkerSets)
New MapScale marker zoom feature.
2017-10-18 11:27:23 -05:00
6590d3d655 Check Slot for Veh Upgrade 2017-10-17 18:31:14 +02:00
2d4a7a0258 crafting changes
reverted changes to check Nearby
added crafted item count, default is 1. Allows for crafting multiples of
the same item (for example 1 plant in and 2 Seeds out)
added item return after crafting, this allows the smelting tools to be a
recipe requirement that gets refunded to player.
2017-10-17 07:51:53 -05:00
3eb4d63eba vector building enhancements
rework tempTarget for vectored objects and snapping
2017-10-17 04:50:31 -05:00
0935cb3f08 Animations for Consumeitems 2017-10-17 00:24:38 +02:00
ae1f874dc8 Morphine Usage 2017-10-16 20:56:04 +02:00
853586def5 reworked mineral node harvesting
Can only use sledge hammer only to harvest nodes
seperated loot tables per mineral nodes
chance to loot on first strike 1 in 3
2017-10-16 11:02:09 -05:00
35c9902232 Remove Ammo Tweaks 2017-10-15 18:19:41 +02:00
aaf7b215c9 make use of underwater command 2017-10-13 16:15:03 -05:00
ffa4ad32fd Make Sharks Lootable under Water 2017-10-12 22:48:32 +02:00
63fc23b8cb fix snap checks 2017-10-12 07:04:34 -05:00
9242b01f3b extra debug 2017-10-11 11:30:34 -05:00
28340c2311 Base Building: spawn only ghost
used to spawn static version then swap, now it just spawns ghost version
first.
should also fix Garden_Epoch and other new item kicks.
2017-10-11 00:42:11 -05:00
cd4f557f66 revert side changes for male
unlocked additional uniforms for side = 0,
Side =1 is still reserved for females
2017-10-10 21:29:04 -05:00
cd32c98def cleanup 2 2017-10-10 14:57:11 -05:00
3cb74266dd minor cleanup 2017-10-10 14:55:43 -05:00
ebf28e6dae optimize EPOCH_fnc_weightedArray and usage
added isClass check to make sure item exists before adding to loottable.
updated for use with single array syntax of selectRandomWeighted
2017-10-10 10:50:07 -05:00
49442da4d4 Restrict SP to local resources
Rearming not local turrets do not work, so make it similar to new
Dyna-Options to add / remove Magazines
- Driver can Refuel / Repair and Reload only Driver-Weapons
- All other Seats can only rearm they current available weapons
2017-10-09 22:51:22 +02:00