Commit Graph

273 Commits

Author SHA1 Message Date
Fox McCloud
18293de33b Merge pull request #8399 from uraniummeltdown/hydrofix
Composting plants/pills transfers all reagents
2017-11-27 06:37:18 -05:00
uraniummeltdown
6f0921e832 Composting plants/pills transfers all reagents 2017-11-26 20:57:13 +04:00
uraniummeltdown
7ed2c68ea7 compiles, find and replace particle_effect and effect_system 2017-11-04 20:16:01 +04:00
uraniummeltdown
a0939ca93b finish making smoke OOP, compiles 2017-11-03 22:46:49 +04:00
Birdtalon
124bd9a98d adds check for null beegent 2017-10-08 18:37:53 +01:00
Birdtalon
ead173ac19 remove while loop replace with get_random_reagent_id() 2017-09-15 20:09:27 +01:00
Birdtalon
4dcdd649f9 prevents bees form synthesising forbidden reagents 2017-09-14 21:23:16 +01:00
Birdtalon
af2035af2b pineapples grow on plants not trees 2017-08-26 22:47:05 +01:00
Birdtalon
bf5ea8fcea final additions 2017-08-26 22:33:01 +01:00
Fox-McCloud
b1495e7cf5 comment tweak 2017-08-06 09:06:57 -04:00
Fox-McCloud
223d608aa8 styling 2017-08-01 18:31:52 -04:00
Fox-McCloud
ca49a28f02 Updates Hydroponics, Nerfs it, Adds Onions 2017-08-01 17:58:23 -04:00
Crazylemon64
807084e304 Most of fox's changes 2017-07-21 15:20:12 -07:00
Crazylemon64
a8e7716649 Refactors slipping to be completely general for items 2017-07-16 19:20:55 -07:00
Fox-McCloud
05a24da2e8 The Most Non-Edgey PR Ever 2017-07-01 19:48:43 -04:00
Sam
4817c841b0 Fixes 7564 2017-06-20 03:51:21 +01:00
Sam
1c996491dd Removes more unnecessary code
And revert of something that is just adding an unnecessary check by
doing the QDEL_NULL
2017-06-17 09:27:56 +01:00
Sam
d0dde4f3d7 Uses more QDEL_NULLs 2017-06-15 00:49:00 +01:00
Sam
4d57fff5c9 Updates Intents 2017-06-10 09:43:36 +01:00
Sam
2d13e2f7bf Converts /modules/ to using WEIGHT_CLASS_x 2017-05-28 01:25:09 +01:00
Fox McCloud
12c4b2933c Hydro and Bees GC fixes (#7221)
* Hydro and Bees GC fixes

* more shit
2017-05-06 15:01:36 -07:00
Fox-McCloud
5631d36ff8 Converts Most Destroys to use QDEL_NULL 2017-04-04 23:08:41 -04:00
Crazy Lemon
c6abe7822b Merge pull request #6961 from Fox-McCloud/garbage-collect-stuffs
Garbage Collection and Code Cleanup
2017-04-01 22:58:52 -07:00
Fox-McCloud
838d58b1a5 for fixes 2017-03-28 01:06:03 -04:00
davipatury
8963e96c41 effect/spider to structure/spider 2017-03-27 19:01:25 -03:00
davipatury
b91fbe264e effect/glowshroom to structure/glowshroom 2017-03-27 18:52:19 -03:00
davipatury
82bfd6e4b3 effect/spacevine to structure/spacevine 2017-03-27 18:51:08 -03:00
FalseIncarnate
2d4e7d88ee CanPass tweak 2017-03-26 00:06:00 -04:00
FalseIncarnate
dfc56148d3 soil CanPass() override
Small piles of dirt are no longer going to stop you from your botanical
machinations.
2017-03-25 14:00:01 -04:00
FalseIncarnate
45354f9ccf Don't Fear the Reaper
Re-adds the admin-spawned Telescopic Scythe
- Originally added in #1025, this was (probably accidentally) removed
with TG botany.
- Extended tele-scythe damage increase from 13->15 to give it a very
small bonus over the normal scythe in addition to its folding
capabilities

Fixes scythes not properly clearing multiple vines on-hit.
- Telescopic scythes only will do this if extended; they are next to
useless against vines while folded

Added an on-back sprite for the telescopic scythe while extended
(recolored scythe). Folded telescopic scythes worn on the belt do not
have an on-mob sprite.

🆑
rscadd: Re-adds the telescopic scythe, the pinnacle of covert reaping
technologies. Currently admin-spawn only, for use in the most dire of
harvest times.
bugfix: Scythes (normal and telescopic) should once again clear swathes
through all but the hardiest of vines when in proper reaping
configurations, and heavily damage those they don't outright destroy.
/🆑
2017-03-24 04:58:01 -04:00
Fox McCloud
b0dc4ccab2 Merge pull request #6738 from uraniummeltdown/shadowshroom
Shadowshrooms + Glowshroom Nerf + Station Lighting Nerf
2017-03-23 12:39:36 -04:00
uraniummeltdown
0f5c0e40e2 nerf station lighting along with shadowshroom glow power, fix shroom spreading, endurance fix 2017-03-23 14:12:17 +04:00
uraniummeltdown
658e0f6a82 adds shadowshrooms from tgstation, nerf glowshroom glow a bit and add new vars for glow, add new shadow and red light genes 2017-03-11 13:36:04 +04:00
uraniummeltdown
9eb7eea1e9 removes fourth argument air_group of CanPass() as it's not used and is a leftover from FEA 2017-03-10 22:46:02 +04:00
Fox McCloud
d7d1e42cc2 Merge pull request #6678 from LordJike/carrot-tweaks
Makes carrots processable into wedges and makes said wedges fryable into carrot fries
2017-03-09 21:36:40 -05:00
Markolie
3aa1399995 Implement usesound/toolspeed 2017-03-07 16:46:28 +01:00
Jike
041c573f42 Makes carrot wedges available through the processor instead of cutting with a knife 2017-03-06 18:15:47 -04:30
Jike
07982121ec Carrots can be sharpened again, carrot shivs can be cut into wedges 2017-03-04 23:13:04 -04:30
Jike
7fc798b299 Full tweak 2017-03-04 05:18:02 -04:30
Crazy Lemon
9382db1767 Merge pull request #6430 from FalseIncarnate/botany2
Botany adjustments/re-addition/fixes/whatever (RE-UPLOAD)
2017-02-24 12:03:07 -08:00
FalseIncarnate
622f36575e A little faster
3x -> 2x
2017-02-13 23:33:28 -05:00
FalseIncarnate
b0f46a28a1 Re-Adds Hydro Tray Covers
Also fixed a derp with the define
2017-02-12 23:32:49 -05:00
FalseIncarnate
030dba205d Slows Plant Aging
Now with a define instead of a magic number for easy tweaking.
2017-02-12 23:22:02 -05:00
Markolie
f701813f6e Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into admin_interact
# Conflicts:
#	code/modules/client/client defines.dm
2017-02-12 00:03:49 +01:00
Markolie
e6ce0924b8 Fingerprint/set_machine consistency 2017-02-10 23:37:03 +01:00
Markolie
0117892f54 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into admin_interact
# Conflicts:
#	code/game/machinery/doors/firedoor.dm
2017-02-10 18:18:29 +01:00
CoreyLee Hassell
88f006432b Fixed reagents in destroying angels
Had listed amantin twice in the reagent_add function for destroying angel. Combined to 0.3
2017-02-10 11:14:04 -05:00
Markolie
4a155bfb50 Admin interaction update 2017-02-08 23:27:08 +01:00
Crazy Lemon
4f32d8f0f8 Merge pull request #6339 from Fox-McCloud/botany-reagents
Botany reagents Tweak
2017-02-07 20:03:08 -08:00
Fox-McCloud
15b4fc04a5 plasma in blumpkins 2017-02-07 07:01:58 -05:00