Commit Graph

1679 Commits

Author SHA1 Message Date
Krausus
6ef0c00921 Adds missing canmove check 2015-05-09 07:41:21 -04:00
FalseIncarnate
db9d9fc647 Botany / Xenobotany Update
Largely a port of https://github.com/Baystation12/Baystation12/pull/8038
(Credit to Zuhayr for his hard work on botany)

Breakdown of the port:
- Plant traits have been expanded drastically
- You want a bio-luminescent tomato that explodes into a cloud of acid
when thrown or stepped on? Or maybe a corn vine that entangles people
and injects them with mannitol and it's harvests that can be used as a
battery? Totally possible.
- Adds new random seeds! Replaces the egg-plant seed in the exotic seeds
crate from cargo with 2 of these.
- Literally random, they have randomly generated stats, chemicals, and
traits. Great for researching, and/or wasting cargo's supply points.
- Plant analyzers can now print off the last scan they recorded, meaning
you can distribute copies of the report to validate your claims of
having the dankest weed on station.
- Potatoes, carrots, watermelons, soybeans, and pumpkins can all be
sliced/diced/carved with ANY sharp object, such as knives, hatchets,
glass shards, and e-swords.
- This should give the chef a bit more room to make it look like he
actually is doing the work by slicing up fries by hand. The processor
still also works.
- New reagent: Wood Pulp
- Currently has no use in recipes, but any plant with this reagent in it
can be chopped into planks with a hatchet. Did someone order some
Ambrosia Deus planks?
- Also, vines with woodpulp are dense. You have been warned.

Now onto the stuff I did in addition to the stuff from Bay.
- Fixed typos where plasma was mistakenly called "phoron" in the port.
(Sorry bay)
- Replaced bay's botany mutation chances with our tiered mutation
system.
- Re-re-added tobacco, space tobacco, tea aspera, tea astra, coffee
arabica, and coffee robusta.
- Re-enabled the rolling of joints
- Made it possible to hand-roll cigarettes from tobacco / space tobacco.
(A requested / promised addition)
- Just like with joints, it will inherit any chems in the tobacco, has
the same reagent capacity as a joint, but looks and smokes like a cig
(lasts as long as the cigarettes) with a different name/description to
differentiate it from pre-made cigs.
- Corn can now be juiced in the grinder, in addition to grinding it.
Grinding corn will result in it's contained reagents (like corn starch),
while juicing corn will result in corn oil.
- Re-added the additional plant analyzer information when scanning trays
(displays age, weed level, etc)

Also cleaned up the recipes_microwave.dm file, removing the commented
out recipes that were distributed to the other machines during the
Kitchen Overhaul. Shortens the file a bit and makes it more readable.

I probably forgot stuff, so I will add things as I remember them / they
get pointed out.
2015-05-09 06:00:24 -04:00
Krausus
5567c99a44 Adds drag-drop emptying to all containers
Also, fixes several missing checks and a facing mistake.
2015-05-09 02:25:38 -04:00
Fox-McCloud
a02f560711 [Goonchem] Cryox/Clonex Change 2015-05-08 18:32:00 -04:00
TheDZD
6515b10ccc Merge pull request #963 from ZomgPonies/superhero2
Superhero Overhaul Part 2: Magnetic Boogaloo
2015-05-08 16:55:59 -04:00
Krausus
d8e6893e35 Improves dumping of "quick" containers
Allows all "quick" containers to be dumped into a disposal (click) or
onto a table (drag-drop).
2015-05-08 07:20:44 -04:00
Fox-McCloud
b20104b360 Various Fixes and Tweaks 2015-05-07 23:31:39 -04:00
ZomgPonies
d3a8caddbf Makes Owlman's belt reload every 60 seconds 2015-05-07 18:04:12 -04:00
Fox-McCloud
828e3c9927 Merge pull request #952 from ZomgPonies/superhero
Massive Superhero Update
2015-05-06 23:40:08 -04:00
ZomgPonies
31fc0d39a5 Final touches on superheroes 2015-05-06 23:26:33 -04:00
ZomgPonies
3503c285fa Add toolbelt with smokebombs and bolas to owlman 2015-05-05 20:48:27 -04:00
Fox-McCloud
cbb2b819fd Enables Bag Item Stacking 2015-05-05 17:29:03 -04:00
Fox-McCloud
5aada8a9a3 Merge pull request #906 from Krausus/NicotineAddiction
Cigarette Fixes/Tweaks
2015-05-02 23:29:49 -04:00
Krausus
c000cb4c78 Doubles cigar(ette) capacity, tweaks base nicotine 2015-05-02 23:08:17 -04:00
Krausus
f6ad960f60 Allows synthetics to get reagents from cigarettes 2015-05-02 22:43:44 -04:00
Krausus
21b92a80f9 Tweaks cigarette reagent depletion message 2015-05-01 22:46:53 -04:00
Krausus
73983dc433 Fixes putting cigars and pipes into cigarette packs 2015-05-01 04:28:18 -04:00
Krausus
e5f0d0bb6a Changes nicotine pre-generation and fixes lacing 2015-05-01 01:41:19 -04:00
Krausus
d2588f64ec Fixes some code that was triggering Goofball 2015-04-30 23:12:28 -04:00
Krausus
7651325497 Reverts nicotine addiction changes 2015-04-30 22:30:53 -04:00
Krausus
96f2a087ad Re-adds passive nicotine comment
Thanks for eating my comment, git.
2015-04-30 09:26:14 -04:00
Krausus
54b979eb34 Adds nicotine addiction to smokables 2015-04-30 09:22:21 -04:00
Tigercat2000
b91d86abcd Makes RCD qdel doors
This still doesn't fix the turf-not-updating bug, but it does make the RCD
qdel doors.
2015-04-29 20:26:59 -07:00
Tigercat2000
62657448d4 Reintegrate mob fire
I took out the entire on_fire system to work on LINDA. This commit readds
it.
2015-04-28 13:57:58 -07:00
Tigercat2000
4f1053f5b7 LINDA, Stage 1
This commit ports the base system of LINDA from TG. This version of linda
is the original version, with none of -tg-'s fixes, rewrites, or other
such improvements attached.

The mob ignite system has been 100% removed, as LINDA does not support
this normally. It may be added back in when the improvements and refactors
to LINDA have been ported.
2015-04-28 08:43:42 -07:00
Fox-McCloud
9885688934 Traitor Item Additions and Surplus Crates 2015-04-21 03:05:12 -04:00
Fox-McCloud
33233941d5 [Goonchem] Reagent Decals 2015-04-17 18:27:49 -04:00
ZomgPonies
98af2982c8 Merge pull request #820 from tigercat2000/Spraycans
Adds spraycans, fixes lipstick, modifies scleaner
2015-04-16 16:39:19 -04:00
ZomgPonies
ee5961d73e Merge pull request #793 from Fox-McCloud/chainsaws
Adds in Chainsaws
2015-04-16 16:36:20 -04:00
Sawu
d038a0710c Adds spraycans, fixes lipstick, modifies scleaner
This commit does the following:
 - Adds spraycans as a subtype of crayons.
   - Slight crayon overhaul to make room for this
   - Can spray graffiti, runes, and letters on floors & walls
   - Can spray mobs and paint their face

 - Fixes & overhauls lipstick
   - Lipstick is now overlay and Blend() based.
   - Also fixes a few bugs with the system.
   - Updates paper code to accomodate for wiping off spraypaint as well

 - Slight modification to space cleaner
   - Space cleaner now cleans your face of lipstick and spraypaint
2015-04-15 17:19:08 -07:00
Tigercat2000
acc3755a98 Adds glass tables, glass table frames
This commit adds glass tables (credit to WalterJe of -tg-'s fourms for
the sprites) to the game. These can be constructed with two metal
sheets, and two glass sheets. Flipping the table causes it to shatter
and deconstruct itself. You can deconstruct the table at any stage
with a wrench.
2015-04-13 06:29:05 -07:00
Fox-McCloud
d04b9ad0de tweak 2015-04-12 19:57:27 -04:00
Tigercat2000
29c59bd51b Add check for antags in msg_admin_attack
This commit first adds a new helper proc labeled isAntag(), as well as
adding a check for antags for every instance of msg_admin_attack().

Goals of this commit:
 - Make admin ATTACK: logs indicate if attacker is an antagonist.

Note; High probability of merge conflicts, 47 files changed.
2015-04-12 08:41:53 -07:00
Fox-McCloud
421c27b4e4 chainsaw fixups 2015-04-12 07:44:11 -04:00
Fox-McCloud
ff0f29c5e5 Chainsaws 2015-04-12 04:47:17 -04:00
ZomgPonies
e3050f5cc1 Merge pull request #771 from Fox-McCloud/nukies
Nukies--Chemsprayer and New Grenades
2015-04-09 16:22:19 -04:00
ZomgPonies
e384ff688b Merge pull request #772 from tigercat2000/IDfix
Fix ID examine gender, Agent card overhaul
2015-04-09 16:21:32 -04:00
ZomgPonies
00b2ad3fbd Merge pull request #770 from TheDZD/muh_valids
Anti-Meta Paraphernalia
2015-04-09 16:21:17 -04:00
Tigercat2000
173d746214 wow I left an entire unused proc in I am so good at this 2015-04-09 05:20:55 -07:00
Tigercat2000
eeed80e120 Fix ID gender, bit of an agent-ID overhaul 2015-04-09 05:10:41 -07:00
Fox-McCloud
b8230aefe6 Nukies--Chemsprayer and New Grenades 2015-04-08 23:39:07 -04:00
DZD
395e4b2cad Don't kill me please
- Changes cattle prod to w_class 4, meaning it can no longer fit in
backpacks.
2015-04-08 18:41:35 -04:00
Tigercat2000
f026083397 Obtainable dice and D&D figures
- Adds D&D figure box to library
 - Adds both full dice set box and D&D figure box to cargo store
2015-04-08 15:03:43 -07:00
Tigercat2000
3eb1339a65 -tg- Dice overhaul 2015-04-08 03:42:44 +02:00
Fox-McCloud
dec621eefd Revert "R&D Research Levels Unification" 2015-04-07 01:16:19 -04:00
ZomgPonies
4e9daf6aa8 Merge pull request #746 from jack-fractal/write-research-debug
R&D Research Levels Unification
2015-04-06 23:28:27 -04:00
jack-fractal
a0be969870 Unifying tech levels
Unifies tech levels between design and their products.
2015-04-06 22:07:44 -04:00
Tigercat2000
34d0bdc946 Fix exploit to get around delay, change to notice instead of warning 2015-04-07 02:26:25 +02:00
Fox-McCloud
7c739e4745 Merge pull request #710 from ZomgPonies/limb
Port of the BS12 limb overhaul
2015-04-05 19:06:39 -04:00
ZomgPonies
e733d1caf0 Merge pull request #730 from Fox-McCloud/tweaks-and-tweaks
[Goonchem] More Additions and Tweaks
2015-04-05 19:02:18 -04:00