Commit Graph

2016 Commits

Author SHA1 Message Date
XDTM 854eb19e9b Refactors mineral golem code (#22354)
* Improves code

* old comment

* p_their actually

* just in case
2016-12-23 09:35:26 +13:00
oranges 6eab8df572 Byond stacktraces (#22361)
Byond help
2016-12-22 13:40:52 +01:00
Cyberboss ac1b6b1a31 Readds some of the harder to access freon sources (#22181)
* Revert "Freon Removal"

* Implements XDTM's fix
2016-12-21 10:04:55 +13:00
XDTM f3ed316aa3 Replaces black magic spawn with addtimers (#22291)
* Black magic begone

* Also fix a bug
2016-12-19 12:00:08 +01:00
swindly 40b25767d2 Adds eggnog (#22238)
* adds eggnog

* adds carton
2016-12-17 14:19:23 -05:00
Cheridan 8256c93828 Merge pull request #22186 from PKPenguin321/patch-5
nerfs growth serum
2016-12-14 22:19:20 -06:00
coiax 4556cf5e29 Adds multiple upgrades for Medical cyborgs (#22149)
* [WIP] Adds multiple upgrades for Medical cyborgs

🆑 coiax
add: Adds upgrades for the medical cyborg!
add: The Hypospray Expanded Synthesiser that adds chemicals to treat
blindness, deafness, brain damage, genetic corruption and drug abuse.
add: The Hypospray High-Strength Synthesiser, containing stronger
versions of drugs to treat brute, burn, oxyloss and toxic damage.
add: The Piercing Hypospray (also applicable to the Standard and
Peacekeeper borgs) that allows a hypospray to pierce thick clothing and
hardsuits.
add: The Defibrillator, giving the medical cyborg an onboard
defibrillator.
/🆑

- [ ] Price the material cost of the boards appropriately
- [ ] Get the defib upgrade working

* Got the defib working

* Adjusted research and costing levels

* Missed a close paren
2016-12-15 10:50:13 +13:00
PKPenguin321 c65ed93649 nerfs growth serum 2016-12-13 18:50:01 -08:00
Fox McCloud 11351543ee Adds Random Seeds and a New Trait and Further Gene Datumizing (#22050)
* Adds Random Seeds and a New Trait

* duplication

* weed rates and chances

* fixes rates

* faster random reagents
2016-12-13 15:00:42 +13:00
Cheridan 07c399fc8e Merge pull request #22061 from swindly/alcohol
Fixes some drink stuff
2016-12-10 19:26:25 -06:00
swindly 45a7c59d08 changes stuff 2016-12-08 16:53:47 -05:00
Mervill 417c50efa2 These comments where removed by me.exe, just now 2016-12-08 01:48:46 -08:00
Kyle Spier-Swenson dedb16826e Speeds up world init. (93s -> 49s) (#21992)
* Speeds up world init.

* Armor is now new inited for obj and the first level of subpaths.
* Actions is now lazyinited and deleted with empty.
* Actiontypes is now only inited when actually used and deleted once it pre-fills actions with the action buttons.
* Pipes now prefill their node list(s) in new() using new /list/ (count) syntax to speed up the list initaliztions and remove the init proc.
* Pipes no longer store their item version, instead creating it on the fly when deconned
* Walls no longer store their metal stacks, instead creating it on the fly when deconned.
* obj, walls, floor, plating, item, machinery, structure, pipe, pipenet, atom, and movable no longer have an (init) proc. (along with a few other smaller examples)
* Atmos can pass checking is now a var with the ability to have a proc be call in advance cases.
  * (as a side effect, I had to fix a few things that were calling atmosCanPass rather then using the pre-calculated list, this should speed up chemfoam and flame effects greatly)

* Reverts upload limit
(remind me one day to defuck this, it could easily be a config thats not editable by vv to make changes easier)

* Makes apc update icon a bit faster.
APC new is some what high on the profile of world init, still not sure why, but this stood out as a waste of cpu so i fixed it.

* Fixes runtime with atmos backpack water tanks.

* Makes smoothing faster (and fixes turfs smoothing twice at init)

* Makes apcs init faster by replacing some spawns with addtimer

* fix transit turfs.
2016-12-08 21:50:15 +13:00
KorPhaeron d854909e0f Freon Removal (#22025)
* Freon Removal

* Removes more freon sources
2016-12-08 14:40:07 +13:00
MisterTikva d04143eedc Removes growth serum alternation between size 2 and size 1.5 and adds effects for higher dosages (#21962)
* MARIO MEMES

* NEW MARIO MEMES

* NEW NEW MARIO MEMES
2016-12-07 22:28:50 +13:00
swindly b8af084e79 Adds Anacea as a makeable toxin (#21932)
* git gud doctors

* reward for doctors who got gud
2016-12-07 09:43:36 +13:00
Joan Lung 551ede6d35 Kills all remaining text pronoun macros (#21916)
* Kills all remaining text pronoun macros

* review your own code

* oh right one further

* more

* \
2016-12-04 21:32:31 +01:00
Mervill 0972f78800 a_intent now uses defines 2016-12-02 22:27:30 -08:00
Mervill c2e2440953 Merge branch 'master' into w_class
Conflicts:
	code/game/objects/items/weapons/twohanded.dm
2016-12-02 21:44:24 -08:00
Jordie ca6ffdba40 Merge pull request #21866 from Mervill/slashes_deux
Remove slash from end of type refs/defs
2016-12-03 15:56:10 +11:00
Mervill 09ea5ad2e5 w_class now uses defines 2016-12-01 21:33:14 -08:00
Joan Lung a5ae025549 Replaces "specflags" with "species_traits" (#21851)
* Replaces "specflags" with "species_traits"

* this will do
2016-12-01 21:16:33 +13:00
Mervill 01d4232570 Remove slash from end of type refs/defs 2016-11-30 19:23:15 -08:00
Mervill b5578df27d corrects some defs without leading slash (#21843) 2016-11-30 20:05:14 +13:00
Cheridan f77841a011 Merge pull request #21811 from GunHog/No_One_Escapes_His_Tiny_Prick
Fixes Syndicate Medical Cyborg Penetration
2016-11-29 20:08:10 -06:00
oranges bfa6d1e11c Merge pull request #21774 from swindly/microwavereagents
Makes microwaves heat reagents
2016-11-28 23:06:38 +13:00
GunHog 8a2362c9a0 Fixes Syndicate Medical Cyborg Penetration
Syndieborg hyposprays now properly penetrate thick clothing.
2016-11-28 00:14:09 -06: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