Commit Graph

2342 Commits

Author SHA1 Message Date
Alexander P. Ulan Hernandez
f0d70a42b0 Rubber Shotgun Pellets
Adds rubber shotgun pellets, which spawn in the riot shotguns and can be
produced at an autolathe.
2015-07-02 21:29:18 -04:00
Ikarrus
55bec2d24d Adds a thrownby var that's used by admin logging. 2015-07-01 13:00:12 -06:00
oranges
ae99453a72 Remove taser firing delay
Making the game unintuitive as fuck and annoying as shit is not a balance
change, I'm frankly quite suprised it was merged in the first place

In the future don't nerf the interface as a balance fix
2015-07-01 20:44:01 +12:00
xxalpha
cfb5e724b6 Material container, all items can have materials, wake me up
cant wake up

go to sleep debug
2015-07-01 03:34:47 +01:00
Razharas
4bea01ce34 Del pin in gun
Del pin in gun
2015-06-29 20:13:43 +03:00
Razharas
1a0c027cc2 Added pin removal recipe
Added pin removal recipe
You need plasmacutter to do it and some other shit
2015-06-29 18:43:37 +03: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
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
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
Thunder12345
1c83cc6d45 Pray pray pray 2015-06-18 18:07:57 +01:00
Cheridan
470f21a752 Merge pull request #10004 from Ikarrus/gangimplants
Gang Update: Loyalty Implant Edition
2015-06-18 10:41:15 -05: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
Ikarrus
fe14ff46ee - Reduced uzi ammo to 25 influence cost
- Added uzis to summon guns
- uncapitalized uzi names
2015-06-17 19:26:02 -06:00
Razharas
f4cf6ffc95 Merge pull request #9978 from phil235/XrayGunNerf
Nerfs xray gun
2015-06-17 22:13:53 +03:00
Thunder12345
608486a919 Typo fix 2015-06-17 18:55:05 +01:00
Cheridan
ee87a1dc23 Merge pull request #9974 from phil235/MirrorRaceChangeFix
Mirror race change fix
2015-06-17 12:54:19 -05:00
Ikarrus
556b25aec3 Added 9mm 2-burst 32 mag uzis that costs 40 influence. Unlike tommy guns gangs will be able to purchase ammo for uzis. 2015-06-17 09:36:15 -06: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
phil235
c177f99d63 Xray gun nerf is just the 15 tiles range. 2015-06-16 19:49:25 +02:00
phil235
56cd6d7140 Changes xray beam to have reduced damage instead of reduced range when hitting something. 2015-06-16 18:35:20 +02:00
Xhuis
3bc466a0ff Merge remote-tracking branch 'remotes/upstream/master' into thaw 2015-06-16 11:42:47 -04:00
Cheridan
7aba70ecf3 DRAGnet lives! 2015-06-15 23:55:28 -05:00
phil235
63a68a97b2 Nerfs xray gun by giving it a shorter range that gets shorter if it hits things.
Make vault airlock more explosion resistant (explosion_block var).
2015-06-15 20:53:28 +02: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
phil235
1e8ec967d3 Fixes a runtime with staff of change changing species. 2015-06-15 17:12:23 +02:00
Iamgoofball
a00e11520c Merge branch 'master' of https://github.com/tgstation/-tg-station into graphics 2015-06-14 15:42:15 -07:00
Remie Richards
eb68aa824e Merge pull request #9777 from KorPhaeron/timestop
Timestop now with webm
2015-06-14 22:27:17 +01: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
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
d2ef043690 Resolved Conflicts:
code/modules/mob/living/living.dm
2015-06-11 23:46:59 -06: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
Iamgoofball
f992eb1af0 Adds feedback gathering for a hell of a lot more things. 2015-06-09 21:52:46 -07:00
Xhuis
700c461422 FEATURE FOUR: Bulldog shotgun darts 2015-06-07 13:08:17 -04:00
Dorsisdwarf
fc88bce4b6 sets default shotgun ammo to slugs, makes syndicate ammo bag actually have ammo in it 2015-06-05 14:05:32 +01:00
KorPhaeron
f2abe13f51 New Sepia Slime Reaction
Adds a new sepia slime plasma reaction, timestop.

Freezes all mobs/projectiles in a 5x5 area for the duration, the creator
of the timestop is immune. Adds a new sepia slime reaction, timestop.
Activated with plasma, it
creates a bubble that freezes any mobs/projectiles in place for the
duration. The creator of the bubble is immune to its effects. Currently
a 5x5 area

When it ends, projectiles continue on their original path.

Moved camera and film to blood and water, respectively, if anyone even
cared about those.

Might need tweaking/balancing, but considering scientists can make bombs
and this takes longer, I don't think it'll be that bad (especially since
you can't melee people in the field)
2015-06-03 21:45:09 -05: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
905f350597 Merge branch 'unsimulatedIsKill2' of git://github.com/Aranclanos/-tg-station into Aranclanos-unsimulatedIsKill2
Conflicts:
	code/game/smoothwall.dm
2015-06-02 13:45:56 -05:00
Aranclanos
e7c0d7e95c Removes unsimulated turfs.
Moves shuttle turfs to paths under /turf/simulated/floor and /turf/simulated/wall
Players can now safely build on top of shuttle turfs
Fixes #1711
Adds several but not all paths for the different types of floor turfs, most of them in plasteel_floor.dm
The turf pathings are still in need of a deeper organization, but this is at least a start
2015-06-01 23:24:18 -03: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