Commit Graph

1990 Commits

Author SHA1 Message Date
oranges
bfa6d1e11c Merge pull request #21774 from swindly/microwavereagents
Makes microwaves heat reagents
2016-11-28 23:06:38 +13:00
XDTM
23906c811a Adds more golem types, adds golem shell creation with adamantine slimes (#21708)
* Diversifies golems

* Golems

* fixes a bug

* Glass golem + species bullet_act support

* Glass shatter

* More golems

* Final changes

* Added to xenobio

* update

* minor space

* Totally bananas

* silly me

* what Joan said

* Updated titanium, plastitanium, and alloy golems.
2016-11-28 18:34:08 +13:00
oranges
af7e6d1323 Fixes all remaining addtimers missed 2016-11-27 08:31:07 +00:00
swindly
203c199183 1000K 2016-11-26 14:34:04 -05:00
swindly
65eebaf38e reagents get hot 2016-11-25 23:15:56 -05:00
oranges
6c1966d393 Merge pull request #21612 from KorPhaeron/ssreligion
Ssreligion
2016-11-20 14:54:12 +13:00
swindly
2d503675d2 Adds nitrous oxide reagent (#21608)
* Adds liquid nitro

* other reagent

* removes duplicate
2016-11-20 14:51:46 +13:00
kevinz000
29e654d8a9 [READY]Fixes Peacekeeper Cyborg Chemicals (#21512)
* Update toxin_reagents.dm

* Update holosign.dm

* Update holosign_creator.dm

* Update holosign_creator.dm

* Update holosign.dm

* Update robot_items.dm

* Update toxin_reagents.dm

* Update toxin_reagents.dm

* fixes
2016-11-19 13:35:30 +13:00
AnturK
1b35066f07 Merge pull request #21589 from ChangelingRain/thisissuchaterribleidea
Adds an absurd impossible to balance blob chemical
2016-11-18 12:08:41 +01:00
KorPhaeron
969abebade Adds a religion subsystem 2016-11-17 21:01:22 -06:00
AnturK
f883f3e8fc Merge pull request #21578 from optimumtact/negativetwo
Better sanity checking in the chemmaster ui act for user input
2016-11-17 12:20:09 +01:00
Joan Lung
4b7813480a Adds an absurd impossible to balance blob chemical 2016-11-16 17:53:56 -05:00
oranges
c337cdfd04 Sanity checks in chem code
You can no longer add/remove negative amounts.

Removing reagents now ensures you don't remove more of the reagent than
actually exists.
2016-11-16 04:38:03 +00:00
oranges
8b97c8a667 Better sanity checking in the chemmaster ui act for user input 2016-11-16 04:26:02 +00:00
kevinz000
f7483f0a67 [READY]Buffs Teslium Explosions (#21497)
* Update pyrotechnics.dm

* Update pyrotechnics.dm
2016-11-16 10:52:26 +13:00
phil235
b7efc2cef4 Make energy guns able to use burst fire. (#21005)
* Make energy guns able to use burst fire.

* Changed obj/item/weapon/gun/projectile to /gun/ballistic and the name of the folder from "projectile" to "ballistic" to avoid confusion between actually projectiles and guns.

Syringe gun, energy guns and magic guns can now use burst fire.

* fixing merge conflict shit

* fixing map conflicts

* more map conflict fix

* two tiny fixes.

* tiny tweak

* fixing merge conflicts.
Moving the practice mini egun to the gun module.
Renamed nuclear.dm to energy_gun.dm

* map conflict fixes
2016-11-02 16:16:21 +13:00
phil235
2dc956bea0 Merge branch 'master' of https://github.com/tgstation/-tg-station into Color_washing
# Conflicts:
#	code/game/gamemodes/clock_cult/clock_scripture.dm
#	code/game/gamemodes/clock_cult/clock_structures.dm
2016-10-31 19:59:00 +01:00
TehZombehz
cbb527fcec Adds Juiceboxes/Cartons + Apple juice & Choc. Milk (#21206)
* Adds Juiceboxes/Cartons

Adds craftable small cartons and juiceboxes.

* Housekeeping

Thanks, goof.

* Acting upon suggestions

Reduce cost of crafting from 2 to 1 sheet of cardboard, reduced volume
of small cartons from 25 to 15. +Housekeeping

* New Sprites + Fixes

Adds distinct grape, orange, and chocolate milk juice box colors (from
Nienhaus). Adds chocolate milk. Changes standard chocolate recipe to
compensate for chocolate milk change (soy milk chocolate bar recipe
remains the same). Fixes being unable to juice grapes in reagent
grinders.
2016-10-29 18:13:32 +13:00
ma44
88d23a5936 Reopening of #20797 Gold solidification (#21183)
You can now solidify liquid gold into sheets of gold with frostoil and a very little amount of iron
2016-10-29 11:25:13 +13:00
chowdermcarthor
c7e474ccae Neck Slots (#21169)
* Added in a neckslot. Moved some tie items over to said neckslot.

* Changng some stuff to fix the new neckslot items.

* no message

* Altered comment to say that the old tie system is being kept as-is due to armbands and such instead of just avoiding conflicts.

* no message

* Changed the number for this.

* Fixed jaws of life not having a category, thus they only would show up when searched.
2016-10-26 19:03:41 +13:00
oranges
6984de7cc4 Merge pull request #21103 from CyberbossJHCB/SprayDispenser
Allows spray bottles to be used in the chem dispenser
2016-10-24 22:52:56 +13:00
swindly
7caded5cc8 Allows ChemMasters to make multiple bottles at once (#21021)
* chem masters can make multiple bottles

* replaces minmaxes with clamps

* fills bottles

* adds checks

* adds flag

* moves return
2016-10-24 22:52:19 +13:00
phil235
1ce672c630 fixing stuff about atom_colours. 2016-10-21 01:30:42 +02:00
Cyberboss
ef88ba8794 Adds transfer amounts to spray bottle 2016-10-20 18:39:59 -04:00
Joan Lung
f7cb11bf69 Merge pull request #21040 from XDTM/Stats
Allows Pandemic to read stats, adds a properties list var to viruses.
2016-10-19 18:51:40 -04:00
Cheridan
7f6f300587 Merge pull request #21036 from phil235/hugbox
Some nerfs to clothes & item damage
2016-10-19 12:15:35 -05:00
TechnoAlchemist
44c558d438 Fixes deathnettle not yielding sulfuric acid too. (#21028) 2016-10-19 16:54:09 +13:00
phil235
029bc65b93 Merge branch 'master' of https://github.com/tgstation/-tg-station into Color_washing
# Conflicts:
#	code/game/atoms.dm
#	code/game/gamemodes/nuclear/nuclearbomb.dm
2016-10-19 01:56:02 +02:00
phil235
240f3a4c49 Adding var/list/atom_colours to /atom .
The var will be used to store the various coloring that happen for the atom so that we can separate paint coloring from color that must be inherent to the atom (an initial color for example), or from certain coloring effect like revenant's blight, mob electrocution's black color, admin edit of the color var, green color from holding the greentext item, etc.
The list has four elements, used for four categories:
ADMIN_COLOUR_PRIORITY for admin varedits and very rate color effect like holding the greentext item (and other effects that should prime over any other potential source of coloring even temporary effects).
TEMPORARY_COLOUR_PRIORITY for short color effects like revenant blight on mob, mob electrocution making you all black for a couple seconds, effects that should be appearing above paint coloring.
WASHABLE_COLOUR_PRIORITY for pretty much all paint coloring like colorful reagent on mobs, coloring turfs with paint, etc.
FIXED_COLOUR_PRIORITY for color inherent to the atom, like a blob's color, any object with a color value given in its definition.

Fixes electocution animation on mob not making the mob all black (with the skeleton overlay blinking over it)
Spray cleaner and soap can now wash paint off mobs, turfs and objects.
2016-10-19 01:51:30 +02:00
TechnoAlchemist
14a1f7aef2 Fixes Vitrium Frothe metabolization issues. (#21035)
* Fixes vitfro healing not stopping after metabolized.

* . = 1

* CR's Fixes

* = TRUE and bowl pathing fix.

* fixes my stupid fucking mistake you animal you beast!!
2016-10-19 11:47:48 +13:00
MrPerson
5047dd7145 Plane master handling + new chemical Rotatium (#20707)
* Plane master handling + new chemical Rotatium

A whole system to create, store, and access screen master objects from the hud. In case anybody actually wants to do anything relevant with them. Which will probably be me but whatever.

Moves things out to some planes that make sense.
click catcher -99
game 0
lighting 15
fullscreen 18
HUD 19
above HUD 20

Rotatium is more of a demonstration than something I really really love, but it is kinda neat so here you go. It rocks the game plane and lighting planes back and forth and also does light toxin damage. The longer it effects you, the stronger the rocking gets.

No pictures right now, I'll get some later. Sorry.

* Pay no attention to the commit behind the curtain

* Updates travis to 1346, the stable version for 510 for linux
2016-10-18 11:41:23 +02:00
phil235
30ca862473 Fixes hardsuit not having 300hp (I gave it to the helmet, but had forgotten about the suit itself)
All unique traitor steal objective item are now immune to all damage except severity=1 explosion.
Mobs on fire no longer get damage to their worn backpacks, belts, id, pocket stuff, and suit storage.
All backpacks are now nonflammable, and bag oh holding and engineer backpack are now fireproof.
Mob receiving melee attacks now only have its outer layer of clothes damaged, e.g. no damage to jumpsuit when wearing a suit.
Made all hyposprays (not just the CMO's) acid proof.
Made the singularity gen and tesla gen immune to fire.
2016-10-17 22:51:57 +02:00
oranges
25daa7b5f1 Merge pull request #20992 from swindly/spelling
Fixes various spelling/grammar/punctuation errors
2016-10-18 09:15:32 +13:00
oranges
9dcd96f604 Merge pull request #20933 from XDTM/Juicy
Grind slime extracts to get slime jelly/the chems inside
2016-10-18 09:11:37 +13:00
XDTM
fc85b044cc Random stats 2016-10-17 09:02:26 +02:00
XDTM
d7a05acfc4 Fixes silver slimes (#20988) 2016-10-17 00:47:19 -05:00
phil235
f6db08af2e Contents_explosion() tweaks (#20934)
* When any object is hit by an explosion, we no longer always call ex_act() on all its contents indiscriminately.
The default contents_explosion() does nothing and it's overriden for certain objects only like storage items, machines with occupants, mechs.

I've also overriden handle_atom_del() for many objects so that any sudden deletion of an object referenced in an object var of its container properly nullifies such references, avoiding potential runtime and updating the container's icon_state (e.g. admin-delete a mixer's beaker and the mixer's sprite updates immediately).

I've tweaked bomb effect on worn clothes, having some armor but not 100% now still protects your clothes somewhat.

Fixes some arguments of ex_act in living/ex_act() and other mobs.

* derp and map fixes.

* dem map fixes, man.

* More work on code that use implants, simplified now that we can use the "implants" carbon var.

* some fixes

* more typos and fixes.
2016-10-16 10:01:37 +13:00
swindly
deca3e8fc1 diety -> deity 2016-10-15 16:12:37 -04:00
swindly
90f410b8ed fixes mispellings and makes grammar gooder 2016-10-15 14:29:14 -04:00
oranges
c99ad55703 Merge pull request #20941 from ChangelingRain/blobflashbanging
Blobs now properly consider flashbangs to be energy damage
2016-10-14 10:16:26 +13:00
XDTM
87d1b821d8 Slime cores deleted on use (#20902)
Exhausted slime extracts will now dissolve instead of leaving useless used slime extracts.


Slime cores won't be consumed if the reaction outputs chemicals, or if the slime core has extra uses from a cerulean slime.
2016-10-12 15:48:59 +13:00
Joan Lung
98357c94ef Blobs now properly consider flashbangs to be energy damage 2016-10-11 19:55:19 -04:00
XDTM
611b15c377 Juice those slimes 2016-10-11 20:34:12 +02:00
Jordie
1d6d7bda9c Merge pull request #20763 from TechnoAlchemisto/Alchemy_pt_1
Adds plants to lavaland
2016-10-11 13:03:21 +11:00
TechnoAlchemist
622b0ce405 Desc fix 2016-10-10 18:57:20 -07:00
XDTM
8d63a5ee0f Synthflesh can heal dead people (#20819)
* Deadflesh

* Carbons only
2016-10-11 09:46:28 +13:00
TechnoAlchemist
d434ac96f4 Merge branch 'master' of https://github.com/tgstation/tgstation into alchemy_pt_1
# Conflicts:
#	code/game/objects/items/weapons/storage/bags.dm
#	code/modules/mining/lavaland/ash_flora.dm
2016-10-10 13:20:25 -07:00
Joan Lung
ce13143d9d Replaces yet more istypes with helpers (#20806)
* uses more istype helpers

* oranges is inefficient
2016-10-10 17:48:35 +13:00
Joan Lung
ce40d29ead Makes the pronoun helper proc names less horrifyingly long (#20780)
* why were these so LONG, what the fuck

* gosh

* pronoun agenda
the true agenda is killing coiax's squished lines
2016-10-10 12:28:25 +13:00
XDTM
ceedc96509 More Slime Reactions (#20779)
add: Using blood on an Oil Slime will create Corn Oil.
add: Using blood on Pyrite Slimes will create a random crayon.
add: Using water on Orange Slimes will create a small smoke cloud.
add: Using water on Blue Slimes will spawn foam.
2016-10-10 11:22:41 +13:00