Commit Graph

1557 Commits

Author SHA1 Message Date
Cheridan 3b4dbc4f27 Merge pull request #10216 from nukeop/syndiesurgerybag
Add Syndicate surgery bag to uplink
2015-06-29 15:52:55 -05:00
Razharas eb4d6c66a5 Merge branch 'master' of https://github.com/tgstation/-tg-station into VarEdit 2015-06-29 13:42:23 +03:00
Ikarrus cbee684951 Macro/Micro bombs are now restricted to the Nuclear game mode.
Also fixes some broken spans.
2015-06-28 09:57:24 -06:00
Razharas acca364c50 Merge pull request #10191 from Xhuis/thoseDogsAreSleepingByTheWay
Gang Fighting Styles
2015-06-28 17:22:38 +03:00
phil235 e8d3deafab Merge branch 'master' of https://github.com/tgstation/-tg-station into AcidFix
Conflicts:
	code/modules/clothing/masks/gasmask.dm
2015-06-28 15:22:21 +02:00
Razharas 98c2bd18db Merge pull request #9620 from xxalpha/mineralcontainer
Fixed banana shoes mineral handling.
2015-06-28 15:07:17 +03:00
barackobama 0316a836cb add a Syndicate surgery dufflebag full of tools to the uplink
add a Syndicate MMI that lets traitors create subverted cyborgs (not
slaved and with emag laws) - this is included with the surgery bag
2015-06-28 02:54:49 +01:00
Razharas 119c4d7929 Merge pull request #10186 from Anonus/m(i/a)crobombs
M(i/a)crobomb Adjustments
2015-06-28 00:19:06 +03:00
Xhuis 352500d341 Sprites bo staff, adds custom martial art 2015-06-27 15:32:54 -04:00
Razharas 3d556ea970 Some varedit improvements
Fixed give spell window hiding most important part of the spell types
Added call proc to varedit so all things you can open in varedit you can
also call procs on
2015-06-27 18:00:57 +03:00
Xhuis c5a47adb64 Fighting Styles, 1 2015-06-26 14:19:52 -04:00
Cheridan 8c9169f9a8 Merge pull request #10144 from phil235/StimulantsBuff
Buffs stimulants reagent.
2015-06-26 10:37:46 -05:00
Anonus d85a612ee8 Microbombs to 2 TC
So that traitors don't get to have maxcap for 12 TC
2015-06-26 11:37:33 -04:00
Razharas 90a6a8ca96 Revert "Revert "MERGE THIS RIGHT FUCKING NOW I DON'T CARE ABOUT TRAVIS"" 2015-06-26 02:45:02 +03:00
Razharas 97aaa5fb8d Revert "Revert "Microbombs and Macrobombs, Nuke Ops start with Microbombs onc…" 2015-06-26 02:44:20 +03:00
Razharas 69d6cd4f94 Revert "Microbombs and Macrobombs, Nuke Ops start with Microbombs once more" 2015-06-26 02:16:02 +03:00
Razharas a40697c545 Revert "MERGE THIS RIGHT FUCKING NOW I DON'T CARE ABOUT TRAVIS" 2015-06-26 02:12:29 +03:00
Iamgoofball f45127b03c MERGE THIS RIGHT FUCKING NOW I DON'T CARE ABOUT TRAVIS
how did I not notice this AAAAAAAAAAA
2015-06-25 15:28:57 -07:00
phil235 031a98d14c Merge pull request #9836 from AnturK/viral
Makes viruses varedit friendly
2015-06-25 14:09:50 +02:00
Razharas 454dc14b44 Merge pull request #10117 from Iamgoofball/explosive_implant
Microbombs and Macrobombs, Nuke Ops start with Microbombs once more
2015-06-25 12:49:03 +03:00
phil235 83629764d8 Buffs stimulants reagent. Changes the uplink stimpack description (immune to stuns -> nearly immune) 2015-06-25 00:55:11 +02:00
phil235 a029f2852a Merge branch 'master' of https://github.com/tgstation/-tg-station into AcidFix
Conflicts:
	code/modules/reagents/Chemistry-Reagents/Blob-Reagents.dm
2015-06-24 21:15:09 +02:00
Cheridan 054f19d4b4 Merge pull request #9965 from phil235/HandTeleFix
Fixes handtele teleportation failing when the beacon is inside something.
2015-06-24 10:40:04 -05:00
Iamgoofball 4294a583b0 Microbombs and Macrobombs 2015-06-23 15:36:01 -07:00
Remie Richards 64f4adb41e Merge pull request #9510 from Cheridan/nuke_feedback
Nuke Op COMMUNITY FEEDBACK PR
2015-06-23 07:03:17 +01:00
phil235 b0cd6d34b1 Lots of work on acids, smoke, foam, reagents reaction() proc.
- fixed the fraction argument in reaction(...., INGESTED, fraction) so the proper amounts of each reagent react, not all of it.
- slight optimization of datum/reagents/reaction()
- small optimization /datum/reagent/proc/reaction_mob
- the smoke's reagents no longer do direct transfer upon crossed()/move() but uses "reagents.reaction( mob, TOUCH)" only.
- fixes no ingesting smoke if it's in the dark.
- removed block gas smoke effect flag from clown mask and other non "actual" gas mask.
- refactor how protection against touched chems being absorbed is done. get_permeability_protection() to get that protection. No more

simple RNG get touched or not, now the amount that touches you depends on your protection and the volume in question.
- changes acid_act to take volume into account.
- chem_smoke now uses process() just like foam, we remove the reaction from crossed() and Move(), it's only done in process() now.
- optimization of effect/smoke, OOP! And now all smoke effects use objprocessing instead of shitty sleep/spawn
- removed mob var/coughedtime.
- add a volume check to item/acid_act(), there's a threshold to be able to melt and then a probability to melt (acidpwr&volume).
- greatly lowered the amount of reagent in the smoke from dead blobspore (so the volume isn't enough for melting)
- human/acid_act(): damage to limbs depends on acidpwr&volume.
- fixes metalfoam not working.
- smoke powder: only one start() call.
- Amound of smoke objects depends on amount of smoke recipe created.
- Adds an argument to add_reagent() to block automatic call of handle_reaction()
- When using reagents/proc/trans_to(), reactions are now only handled after every reagent is transfered and not before.
- Amount of smoke objects depends on amount of smoke reagent created.
- radius of foam reaction depends on amount of foam reagent created.
- The amount of other reagents inside the smoke/foam decides the life expectancy of the effect.
- The amount of reagents in each small smoke cloud/foam cell depends on the amount of other reagents in the initial reaction but also

how much smoke/foam was created (more smoke means dilution of the reagents).
- smoke/foam's reagent reaction on mob decreases the life expectancy of the effect (to avoid reagent duplication)
- The amount of reagent reacting with atoms is less if the life expectancy is high.(to avoid reagent duplication)
- The amount of movement from the smoke now depends on the number of smoke clouds created.
- removing some useless code in chem_grenade/prime().
- When calling human/acid_act(), item acid melting chance lowers after each each successful melt in the list, some of the acid is

"used" to melt that item so the next items have a lower chance to melt (to make melting every clothing harder).
- remove the banned reagent list from sprays, not needed anymore now that acid is nerfed.
- chem_grenade reaction, if there's no reagent left after reaction (smoke/foam/etc, reagents cleared) you don't get the steam effect

and immediate reaction with all atoms around the grenade explosion. (Fixes foam cleaner grenade deleting bloodstains around it as soon

as the grenade explodes, even if the foam hasn't reached the tile yet).
- melted storage items now drop their content instead of deleting everything.
2015-06-22 00:35:24 +02:00
Razharas e6b738734a Merge pull request #8876 from xxalpha/fixfixfix
Cyber Implants + (Pt.2)
2015-06-21 22:12:17 +03:00
Cheridan 5d6f812474 Merge pull request #10024 from palpatine213/CorgiVirusFix
Fixes the corgi transformation virus
2015-06-21 10:39:02 -05:00
Xhuis bc7d1ab93d Changes the way the airlock charge works 2015-06-19 14:46:06 -04:00
Xhuis 2823a98244 Merge remote-tracking branch 'remotes/upstream/master' into thaw 2015-06-19 11:23:45 -04:00
Swag McYolosteinen e4281bbaab Merge pull request #10019 from Thunder12345/autoshotgun
Moved combat shotguns to shotgun/automatic/combat
2015-06-19 17:06:00 +02:00
Swag McYolosteinen 1dde070d18 Merge pull request #9800 from Dorsisdwarf/wittybranchname
Buffs nuke ops [merge ready]
2015-06-19 12:00:23 +02:00
Xhuis e1356f889e Merge remote-tracking branch 'remotes/upstream/master' into thaw 2015-06-18 23:37:06 -04:00
palpatine213 9f87f10077 Fixes a typo 2015-06-18 14:48:35 -07:00
Thunder12345 1c83cc6d45 Pray pray pray 2015-06-18 18:07:57 +01:00
phil235 e6dcabf245 Merge pull request #9960 from xxalpha/bass
Put drop_item() calls inside ifs. Replaced some drop_item() with unEq…
2015-06-18 15:50:35 +02:00
palpatine213 e48d98323a Fixes the corgi transformation virus 2015-06-18 01:58:37 -07:00
AnturK b0191fbb6d White to black 2015-06-17 18:41:08 +02:00
Thunder12345 bfb2345726 Moved combat shotguns to shotgun/automatic/combat
- shotgun/automatic/ will pump itself automatically on firing
 - combat shotgun capacity nerfed to 6 rounds
 - replaced all instances of the old path with the new one
2015-06-17 15:25:59 +01:00
Xhuis 3bc466a0ff Merge remote-tracking branch 'remotes/upstream/master' into thaw 2015-06-16 11:42:47 -04:00
phil235 ae8c69f9a7 Merge pull request #9955 from kingofkosmos/spanspaceremoval
Unnecessary space removal from spans and messages
2015-06-15 18:20:04 +02:00
Jordie0608 8fc003029c Merge branch 'master' of https://github.com/tgstation/-tg-station into ironicthatonehumanisasectorzerolaw
Conflicts:
	code/modules/mob/living/silicon/robot/robot.dm
2015-06-15 16:34:56 +10:00
Cheridan ec8cd61d4c Merge pull request #9808 from Incoming5643/march_of_the_snowflakes
WJohn's Hyper Customizable Lizard Sprites
2015-06-14 17:40:20 -05:00
phil235 cd3f4057a6 Fixes handtele teleportation failing when the beacon is inside something. 2015-06-15 00:39:36 +02:00
xxalpha b2e84a0d3c Put drop_item() calls inside ifs. Replaced some drop_item() with unEquip( 2015-06-14 20:11:40 +01:00
kingofkosmos c8d79e7034 Removed unnecessary spaces in these situations:
"span class = '" changed to "span class='"
"'> " changed to "'>"
2015-06-14 12:13:19 +03:00
Razharas ec6c0465b5 Merge pull request #9879 from Incoming5643/skeleton_man
Magic Mania 1.91: Life's a lich and then you rework the mechanic to be less terrible
2015-06-13 04:24:38 +03:00
Incoming 595bb0c8e4 Generalizes lizard parts to "features" for future non-lizard fields, at the same time merging mutant color into this list
Random lizard bodies will finally have color!

Pushes features almost all the way to the DNA side of thing, the mob side is only needed during character creation.

Note that changes to the save file will invoke a one time per character runtime for legacy characters as the save file purges mutant_color, this is as far as I can tell harmless, has no effect on the player, and is self correcting.
2015-06-12 00:43:35 -04:00
Cheridan 7363088cbc Merge pull request #9802 from Miauw62/AyeEye
Nerfs the AI in several minor ways.
2015-06-11 14:13:52 -05:00
Dorsisdwarf 7afd81e083 removes loaded bag from locker, adds to uplink at discounted price. Lowers cost of least-used ammo type 2015-06-11 08:09:36 +01:00