Fox-McCloud
ec4add0ebf
more fixes and runtime corrections
2017-01-28 04:03:33 -05:00
Fox-McCloud
a69b3f3673
weedkiller fix
2017-01-28 03:10:54 -05:00
Fox-McCloud
80587202fe
forcemove fixes
2017-01-27 21:03:57 -05:00
Fox-McCloud
6fb69e272c
Merge remote-tracking branch 'upstream/master' into botany-rework
2017-01-27 20:15:25 -05:00
Crazy Lemon
04d1b30a7b
Merge pull request #6199 from Fox-McCloud/stun-gloves
...
Adds in Stun Gloves
2017-01-27 16:57:13 -08:00
Fox-McCloud
9fd8718bc7
Merge remote-tracking branch 'upstream/master' into botany-rework
2017-01-27 19:31:07 -05:00
Fox-McCloud
9b56e9ac70
fixes and forgotten botany belt
2017-01-27 19:28:00 -05:00
FlattestGuitar
79e1953f41
Fixes a weird runtime. I think.
2017-01-28 00:48:05 +01:00
Fox-McCloud
6d3ef6001f
drying racks
2017-01-26 23:48:47 -05:00
Fox-McCloud
f85f295f09
spacingggg
2017-01-26 08:15:42 -05:00
Fox-McCloud
4c2ecac801
Merge remote-tracking branch 'upstream/master' into botany-rework
2017-01-26 07:42:05 -05:00
Fox McCloud
25dbef3e40
Merge pull request #6175 from Allfd/RigPort
...
Ports MarsM0nd's RIG suit fixes.
2017-01-26 07:33:15 -05:00
Fox-McCloud
d1463d9718
solving conflicts
2017-01-26 06:59:16 -05:00
Fox-McCloud
51bbe8c466
Merge remote-tracking branch 'upstream/master' into botany-rework
2017-01-26 06:53:18 -05:00
Crazy Lemon
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
Crazy Lemon
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
Fox-McCloud
5e9e417bb4
fixing flowers
2017-01-26 06:23:10 -05:00
Fox-McCloud
73ac77e8df
runtimes
2017-01-26 04:23:43 -05:00
Fox-McCloud
cd93a21a97
nymphs and fixes
2017-01-26 03:38:25 -05:00
Fox-McCloud
a77c40389e
hydro hud working
2017-01-26 02:01:40 -05:00
FalseIncarnate
8ee22e320a
logging changes
...
as requested by mark
2017-01-25 23:44:27 -05:00
Alffd
29e46d20c1
Removes commented out code
...
Removes commented out code
2017-01-25 19:47:31 -05:00
Fox-McCloud
14075be4be
420
2017-01-25 02:16:12 -05:00
Fox-McCloud
084ed30446
more fixes and features
2017-01-25 01:04:01 -05:00
FalseIncarnate
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
Fox-McCloud
36bfee25dc
last of the missing stuff, hopefully
2017-01-24 18:33:22 -05:00
Fox-McCloud
b1f789e104
fixes a ton of thing
2017-01-24 03:23:16 -05:00
Fox-McCloud
5b33a72486
fixesssss
2017-01-23 22:39:01 -05:00
Fox-McCloud
d0b378892d
Merge remote-tracking branch 'upstream/master' into botany-rework
2017-01-23 22:25:00 -05:00
Fox-McCloud
4f72f89ad8
podmen fix
2017-01-23 08:05:55 -05:00
Fox McCloud
263c95b65c
Merge pull request #6234 from FalseIncarnate/bug_fix
...
Allows shovels/spades to remove soil patches
2017-01-23 06:44:34 -05:00
Fox McCloud
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
Fox McCloud
9709b4ddfa
Merge pull request #6219 from Crazylemon64/tg_mapconflict_helper
...
Tg mapconflict helper
2017-01-23 06:04:52 -05:00
Fox-McCloud
3e87bd3370
more adjustments and fixes
2017-01-23 05:56:17 -05:00
Fox-McCloud
5c828db250
fixes, comfrey, and aloe
2017-01-23 05:25:42 -05:00
Fox-McCloud
ea15a83fde
Fires all Lifeguards, Bans Diving, Forbids Swimming, and Restricts Water Useage
2017-01-23 01:56:47 -05:00
Fox-McCloud
7007f6bbdf
Merge remote-tracking branch 'upstream/master' into botany-rework
2017-01-23 01:01:09 -05:00
Fox-McCloud
dc0710135e
more fixes
2017-01-23 00:53:44 -05:00
Fox-McCloud
104bfab759
sprite and code fixes
2017-01-22 23:25:56 -05:00
Fox-McCloud
dde14aa78e
it compiles
2017-01-22 19:57:03 -05:00
Fox-McCloud
706347fd84
even more work
2017-01-22 08:11:31 -05:00
FalseIncarnate
be7f7cea37
Allows shovels/spades to remove soil patches
...
Using a spade (or shovel from mining) on a patch of soil will do one of
two things:
- If there is a plant currently planted in the soil, it will remove it,
freeing up the soil patch.
- If there is no plant present, it will clear away the soil, deleting
the soil patch.
🆑
rscadd: Returns the ability to remove vacant soil with shovels and
spades, and adds the ability to dig up plants in soil to remove them
instantly.
/🆑
2017-01-22 03:24:52 -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
Fox McCloud
e0569091c9
Merge pull request #6222 from Markolie/ann2
...
Announcement fixes
2017-01-19 13:21:18 -05:00
Markolie
cedfc2ccbf
Announcement fixes
2017-01-19 15:12:20 +01:00
Crazylemon64
d945229fcb
Ports over tg's map conflict helping script
2017-01-18 20:27:00 -08:00
Crazy Lemon
2a209f62cd
Merge pull request #5814 from Markolie/ann2
...
Announcement refactor
2017-01-18 19:17:30 -08:00
Crazy Lemon
37a7484976
Merge pull request #6149 from FlattestGuitar/log-upgrade
...
Adds log stacking to admin logs
2017-01-18 19:13:50 -08:00
Crazy Lemon
c16397af3f
Merge pull request #6145 from AndriiYukhymchak/teg_reworks
...
TEG's circulators can now be controlled
2017-01-18 19:04:10 -08:00
