Commit Graph

387 Commits

Author SHA1 Message Date
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
Iamgoofball a8ec1c76df Merge branch 'master' of https://github.com/tgstation/-tg-station into graphics
Conflicts:
	code/ATMOSPHERICS/atmospherics.dm
	code/game/machinery/computer/computer.dm
	code/game/objects/items/weapons/explosives.dm
	code/game/objects/structures/crates_lockers/closets/fireaxe.dm
	code/game/objects/structures/musician.dm
	code/game/objects/structures/tables_racks.dm
	code/game/objects/structures/window.dm
2015-06-23 12:54:26 -07:00
Cheridan 957f987b5d Merge branch 'master' of https://github.com/tgstation/-tg-station into dragnet
Conflicts:
	icons/effects/effects.dmi
	icons/obj/items.dmi
2015-06-22 22:57:53 -05: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
Thunder12345 1c83cc6d45 Pray pray pray 2015-06-18 18:07:57 +01:00
Thunder12345 608486a919 Typo fix 2015-06-17 18:55:05 +01:00
Thunder12345 275bde00ef Changed description slightly 2015-06-17 15:49:56 +01: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
Cheridan 7aba70ecf3 DRAGnet lives! 2015-06-15 23:55:28 -05: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
Iamgoofball a00e11520c Merge branch 'master' of https://github.com/tgstation/-tg-station into graphics 2015-06-14 15:42:15 -07: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
Ikarrus d59c67ecd0 Squashed commit:
[c9795d3] Writing and formatting tweaks

[65aae64] Tweaks to messages and notices, formatting, and cleanup. (+2 squashed commit)

Squashed commit:

[995a61b] I guess I should call them for what they are (9mm)

[0f04213]   - tweak: "While attempting a Hostile Takeover, gangs do not gain influence. Instead, the takeover timer will be reduced by how many territories they control."
  - tweak: "Tommy guns no longer deal stamina damage."

[202c743] Recruitment Pen cooldown is reduced by 10 seconds for every additional member your rival gang has over yours with a minimum of a 5 second cooldown

[c1a3af3] Pen cooldown = 2 minutes
Fixed gang dominators reporting the wrong time on examine() (+4 squashed commit)

Squashed commit:

[78c043e] Pen Cooldown returned to 60 seconds
Spray can cost halved to 5 influence

[4e65dff] - Capped outfits in stock to 10

[1f347a9] Changelog

[615c971] - Added white suits to gang outfits
- Gang outfits are free, but are limited in stock (that replenishes over time) (+2 squashed commit)

Squashed commit:

[1f347a9] Changelog

[615c971] - Added white suits to gang outfits
- Gang outfits are free, but are limited in stock (that replenishes over time) (+2 squashed commit)

Squashed commit:

[202c743] Recruitment Pen cooldown is reduced by 10 seconds for every additional member your rival gang has over yours with a minimum of a 5 second cooldown

[c1a3af3] Pen cooldown = 2 minutes
Fixed gang dominators reporting the wrong time on examine() (+4 squashed commit)

Squashed commit:

[78c043e] Pen Cooldown returned to 60 seconds
Spray can cost halved to 5 influence

[4e65dff] - Capped outfits in stock to 10

[1f347a9] Changelog

[615c971] - Added white suits to gang outfits
- Gang outfits are free, but are limited in stock (that replenishes over time) (+2 squashed commit)

Squashed commit:

[1f347a9] Changelog

[615c971] - Added white suits to gang outfits
- Gang outfits are free, but are limited in stock (that replenishes over time)
2015-06-13 22:13:01 -06:00
Iamgoofball 4de75c539f Merge branch 'master' of https://github.com/tgstation/-tg-station into graphics
Conflicts:
	code/game/objects/structures/crates_lockers/closets.dm
	code/game/objects/structures/table_frames.dm
	code/game/objects/structures/windoor_assembly.dm
2015-06-13 14:20:17 -07:00
Iamgoofball c2256d41fc BAR NOW SHOWS UP ON THE OBJECT YOU'RE INTERACTING WITH 2015-06-13 13:58:08 -07:00
Ikarrus 351fa89c3a - Renamed tommy guns and made them w_class 5. They're powerful as hell, so they're going to have to be non-concealable. (+3 squashed commit)
Squashed commit:

[acab7ea] - Gang messages distinct between bosses and lieutenants.
- Initial gang points reduced to 25 so they can't buy a pen right away

[140e599] 20 -> 10

[b03fbba] Bulletproof vest + Bugfixes (+1 squashed commits)

Squashed commits:

[b03fbba] Bulletproof vest + Bugfixes
2015-06-11 23:42:08 -06:00
Cheridan ed8dffca94 Merge pull request #9721 from Jordie0608/callingspicyfoodwickeddoesntmakesensetome
Bugfix: Witticism depleted editon
2015-06-03 09:49:51 -05:00
Cheridan 2d998452db Merge pull request #9715 from Firecage/datumspaths
Changes alot of datum/ to /datum/, also includes other path types such as /obj/
2015-06-02 23:04:51 -05:00
Cheridan 2aa0247b00 Merge pull request #9701 from Cuboos/SoundsEp2_WizardBoogaloo
Wizard Sounds has the update. Been a bit since i've done a commit, so…
2015-05-31 15:51:59 -05:00
Firecage f79e0fc1aa Updates more paths, for example obj/stuff to /obj/stuff 2015-05-31 17:48:33 +02:00
Jordie0608 03ab08112f animated foam pistol shoots proper darts, no generic surgery, augmented eyesight gives nightvision and reagents in admincookie 2015-05-31 18:25:34 +10:00
Cuboos fcc18020a9 Wizard Sounds has the update. Been a bit since i've done a commit, so forgive me if i did this wrong. Also added the third title song, there a lot of agreement on what to do so i'll just add it as is, if a change needs to be made i'll do it later. 2015-05-29 20:29:37 -07:00
xxalpha aab00c4075 Fixed changeling revival not setting stat to CONSCIOUS.
FIXED IT

Changelog.
2015-05-21 23:51:10 +01:00
Jordie0608 931e93c14c caps horrid icon operation to 100 2015-05-10 15:12:23 +10:00
Cheridan c947a4bea6 Merge pull request #9221 from Firecage/Grenadelauncherfix
Fixes the grammar error of the Grenade Launcher.
2015-05-01 12:17:09 -05:00
Firecage a2070d5c4b Fixes the grammar error of the Grenade Launcher. 2015-04-28 22:27:17 +02:00
Jordie 0c08ffb95e Merge pull request #9183 from GoonOnMoon/ARG1
ARG Assault Rifle Addition
2015-04-28 23:49:33 +10:00
kingofkosmos 761d31cea0 More visible.message span classes removed. 2015-04-24 21:24:21 +03:00
kingofkosmos de280c72b5 Removed some more spans from visible messages. 2015-04-24 21:06:59 +03:00
kingofkosmos a7bd5f93e1 "You hear something" set to italics. 2015-04-24 21:06:16 +03:00
kingofkosmos 3304ffa45f span fixes 2015-04-24 20:52:01 +03:00
kingofkosmos 72749392d8 span classes removed from visible.messages 2015-04-24 20:50:51 +03:00
kingofkosmos 1d14471d00 Ellipses to waiting messages. Warning-spanclasses to failing messages with an exclamation mark. 2015-04-24 20:50:50 +03:00
GoonOnMoon a326594e0f Removes syndie tech origin from the ARG rifle. Adds it to summon guns. 2015-04-20 15:57:39 -05:00
xxalpha fc8148b496 Fixed syringes being chambered when stored in a backpack. 2015-04-20 21:05:18 +01:00
GoonOnMoon d1b102361d Adds Nanotrasen's equivalent of the M90 assault rifle to the game: the ARG. Currently only obtainable with badminnery. Uses 5.56mm ammunition.
Added myself to admins.cfg as a coder.

Added new icons for the ARG.
2015-04-20 14:21:40 -05:00
GoonOnMoon 4f8c791145 Adds a new assault rifle for the nanotrasen noobs to use. Currently only available with badminnery. 2015-04-19 23:50:49 -05:00
phil235 a01b8ef435 Reorganizing the reagents files. Goon chems are no longer in separate files.
All reagents are back to being metabolized every tick. I adjusted the goon chem so their effects aren't changed too much.
Removing some probability and randomness from goon chem effects to make it more predictable.
Adding overdose to space drug.
Making a drug reagent category.
Changed check_ear_prot() for carbons: alien are now immune, and monkey checks their head for ear protection.
Changed flashpowder flashing code and blackpowder explosion code to use already existing procs.
Moved chemical_mob_spawn and goon_vortex procs to /datum/chemical_reaction/
Fixes double overdose message for sugar.
Remove the "if(!M) M = holder.my_atom" at the beginning of a lot of on_mob_life procs, you already can't call on_mob_life if M is null

(Chemistry-Holder.dm).
Moved random_color_list to datum/reagent/colorful_reagent
Nerfed healing power of stimulant. Buffed ephedrine a bit.
Fixes some goon chem on_reaction() proc leaving resulting chem behind when they shouldn't.
Removes Life, nitroglycerin and Corgium reagents. They're now only a chemical reaction.
Moved grenade launcher and syringe gun from reagents module folder to gun folder.
Added a message for the ghost when someone is trying to revive its corpse with strange reagent. (like defib)
Fixes Frost oil and other consumable reagents using current_cycle var.
Fixes runtime where during metabolization a reagent removes another then the latter still calls on_mob_life().
2015-04-16 22:07:24 +02:00
phil235 081bae6740 Fixes broken ui action button for toggling chef apron's sleeves and owl's wings.
Fixes surviving suicide
Fixes suicide damage overlays.
Fixes ninja regen "clothes warm" spam message. (moving rad armor check outside of apply_effect)
Fixes ninja smoke bomb count.
Fixes dead shaved corgi
Fixes lipozine still being in code.
Fixes flattening boxes requiring them to have their window opened.
Fixes armor softening message from disarm attack.
Fixes player being forced to play spiders without choosing.
2015-04-14 13:54:36 +02:00
Ikarrus 71d529a6a5 More adjustments
- added unrestricted-use guns
- excluded fake toy guns
- Unexcluded throwing stars
2015-04-11 14:37:21 -06:00
phil235 7df5998740 Nerfing plasma cutters, their damage and range is reduced in pressurised environment. Reduces drilling cost of all drills to make them appealing. Drill cells are now removed by clicking the drill, no more screwdriver needed. Resonator fields can no longer be stacked on each other. Switching from 5 to 3 seconds detonation on the resonator is now done by clicking it instead of screwdriving. Increasing building costs for plasma cutters. Removes mineral/screwdriver upgrades to resonator and kinetic accelerator. Plasma cutters can now only uses solid plasma. 2015-04-08 03:44:56 +02:00
phil235 d0e9a5c0c9 Nerfs the kinetic accelerator.
Remove the plasma upgrade chance of rigging the cell since it doesn't work as intended and can break the KA without any feedback.
2015-04-06 22:43:03 +02:00
kingofkosmos 2e4a8fcce8 Recieve --> receive grammarfix
Changes all "recieve"s in descriptions around the tgstation to "receive". Also energy katana description high priority fix.

Fixes #8576
Fixes #8504
2015-04-03 19:42:34 +03:00
ACCount12 1c219f0ebe A lot of stuff 2015-03-31 18:30:09 +12:00
pudl 0964979a90 bitch says she wanna keep her throat warm 2015-03-26 21:16:25 -05:00
pudl 69924a15be plasma/ripley update 2015-03-25 18:06:26 -05:00
Fayrik 117d9d11cd Riot darts are now available to Nuke ops and Traitors. And I am SO done with this. 2015-03-22 22:11:56 +00:00
Fayrik 0173c7af6e Adds everything and makes it all work perfectly. It's like I'm almost good at this or something. (Seriously, points of interest: Secbots react to being shot. Dart rigging. Donksoft guns.) 2015-03-21 16:18:32 +00:00
Fayrik d3d491588e Cleaned up the functionality and prepared things for PR. 2015-03-20 23:19:19 +00:00
Fayrik a030c9889e Glorious second commit, introducing (mildly) dangerous rounds and a new suicide check. 2015-03-20 23:03:06 +00:00