ec4add0ebf
more fixes and runtime corrections
2017-01-28 04:03:33 -05:00
a69b3f3673
weedkiller fix
2017-01-28 03:10:54 -05:00
80587202fe
forcemove fixes
2017-01-27 21:03:57 -05:00
6fb69e272c
Merge remote-tracking branch 'upstream/master' into botany-rework
2017-01-27 20:15:25 -05:00
cd31694e12
Merge pull request #6253 from fludd12/GhostBar
...
Respawner Machine (Attempt Deux)
2017-01-27 16:59:36 -08:00
04d1b30a7b
Merge pull request #6199 from Fox-McCloud/stun-gloves
...
Adds in Stun Gloves
2017-01-27 16:57:13 -08:00
9fd8718bc7
Merge remote-tracking branch 'upstream/master' into botany-rework
2017-01-27 19:31:07 -05:00
9b56e9ac70
fixes and forgotten botany belt
2017-01-27 19:28:00 -05:00
79e1953f41
Fixes a weird runtime. I think.
2017-01-28 00:48:05 +01:00
6d3ef6001f
drying racks
2017-01-26 23:48:47 -05:00
a1ac4a9ec2
Merge pull request #6231 from Aurorablade/ThePowerOfSalt
...
THE POWER OF SALT COMPELS YOU
2017-01-26 10:52:44 -05:00
55e58ef471
honk
2017-01-26 10:39:48 -05:00
bb263d58c5
#JustAdminThings
2017-01-26 09:23:49 -05:00
f85f295f09
spacingggg
2017-01-26 08:15:42 -05:00
4c2ecac801
Merge remote-tracking branch 'upstream/master' into botany-rework
2017-01-26 07:42:05 -05:00
25dbef3e40
Merge pull request #6175 from Allfd/RigPort
...
Ports MarsM0nd's RIG suit fixes.
2017-01-26 07:33:15 -05:00
d1463d9718
solving conflicts
2017-01-26 06:59:16 -05:00
51bbe8c466
Merge remote-tracking branch 'upstream/master' into botany-rework
2017-01-26 06:53:18 -05:00
0959e819ec
Merge pull request #6237 from Fox-McCloud/no-pooling
...
Fires all Lifeguards, Bans Diving, and Forbids Swimming...
2017-01-26 03:48:35 -08:00
0e42e416b6
Merge pull request #6176 from Fox-McCloud/reagents-noreact-refactor
...
Makes Reagents Holder Process and Refactors NOREACT
2017-01-26 03:47:30 -08:00
5e9e417bb4
fixing flowers
2017-01-26 06:23:10 -05:00
3cff59ec74
Adds Respawner
2017-01-26 05:09:44 -05:00
73ac77e8df
runtimes
2017-01-26 04:23:43 -05:00
cd93a21a97
nymphs and fixes
2017-01-26 03:38:25 -05:00
3d7051a0c5
Merge pull request #6244 from FalseIncarnate/bug_fix
...
Rigging Lights and Cells now works with Plasma Dust
2017-01-26 02:02:25 -05:00
a77c40389e
hydro hud working
2017-01-26 02:01:40 -05:00
8ee22e320a
logging changes
...
as requested by mark
2017-01-25 23:44:27 -05:00
29e46d20c1
Removes commented out code
...
Removes commented out code
2017-01-25 19:47:31 -05:00
f9218307c0
Fixes shadowling scaling.
2017-01-25 18:34:11 +01:00
15dca8b4aa
Merge pull request #6226 from Fox-McCloud/debug-this
...
Removes Unused Object
2017-01-25 04:15:18 -08:00
14075be4be
420
2017-01-25 02:16:12 -05:00
5a7bf8be78
Merge pull request #6230 from scrubmcnoob/Shadowling-Thrall-Scaling
...
Shadowling Thrall Scaling and Lesser Glare Removal
2017-01-25 01:48:23 -05:00
084ed30446
more fixes and features
2017-01-25 01:04:01 -05:00
29c6a89f45
removes processed bread
2017-01-24 23:24:49 -05:00
a4037ad426
Rigging Lights and Cells now works with Plasma Dust
...
Light bulbs, light tubes, and power cells can now be rigged with plasma
dust from grinding plasma sheets as well as the standard plasma reagent
from a chem dispenser. Both reagents require at least 5u of the reagent
to be injected at once to rig the bulb/tube/cell to explode.
If a rigged cell is inserted into a stunprod, it only explodes when you
actually attempt to stun something with it, not when you turn the prod
on. This was unchanged, but I'm mentioning it so people don't think I
changed that.
Fixes #6238
🆑
tweak: Plasma dust can now be used to rig lights and power cells, like
the plasma reagent, with explosive results.
/🆑
2017-01-24 19:47:18 -05:00
36bfee25dc
last of the missing stuff, hopefully
2017-01-24 18:33:22 -05:00
409d9ecdae
Tweaks
2017-01-24 06:53:32 -05:00
b1f789e104
fixes a ton of thing
2017-01-24 03:23:16 -05:00
5b33a72486
fixesssss
2017-01-23 22:39:01 -05:00
d0b378892d
Merge remote-tracking branch 'upstream/master' into botany-rework
2017-01-23 22:25:00 -05:00
318c339f11
icons are silly
2017-01-23 18:32:40 -05:00
eb4b320676
fox changes
2017-01-23 18:31:13 -05:00
9312d831ae
Lesser Slings count back to 5 and lose veil
2017-01-23 18:07:38 -05:00
4f72f89ad8
podmen fix
2017-01-23 08:05:55 -05:00
263c95b65c
Merge pull request #6234 from FalseIncarnate/bug_fix
...
Allows shovels/spades to remove soil patches
2017-01-23 06:44:34 -05:00
2af1f9bb79
Merge pull request #6185 from Allfd/Enforcer
...
Ports Enforcer handgun, rubber bullets, and new shotgun ammo boxes from Stratus
2017-01-23 06:08:36 -05:00
9709b4ddfa
Merge pull request #6219 from Crazylemon64/tg_mapconflict_helper
...
Tg mapconflict helper
2017-01-23 06:04:52 -05:00
3e87bd3370
more adjustments and fixes
2017-01-23 05:56:17 -05:00
5c828db250
fixes, comfrey, and aloe
2017-01-23 05:25:42 -05:00
ea15a83fde
Fires all Lifeguards, Bans Diving, Forbids Swimming, and Restricts Water Useage
2017-01-23 01:56:47 -05:00
Fox-McCloud