Commit Graph

780 Commits

Author SHA1 Message Date
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
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
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
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
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
Cheridan
c4254a727d Merge pull request #9638 from CosmicScientist/EnglishFixes
Fixed some general spelling and grammar
2015-05-26 03:53:37 -05:00
Cheridan
af31d8d255 Merge pull request #9639 from SconesC/pins-typo
Fixes Clown/DNA pin typo, updates descriptions
2015-05-26 02:32:21 -05:00
Remie Richards
d97da2d9d4 Merge pull request #9590 from xxalpha/memech
Fixed Changeling Revival
2015-05-25 18:29:51 +01:00
Cheridan
99f026d441 Merge pull request #9608 from phil235/TagFiringPinFix
Fixes two runtimes
2015-05-24 18:29:45 -05:00
SconesC
cb2abd0418 Fixes typo and changes desc for clarity 2015-05-24 15:31:49 -07:00
CosmicScientist
a94075d07d Edited pAIcard displayed message, donksoft dart description and some tips of the round. 2015-05-24 20:49:06 +01:00
phil235
77febafb52 Merge pull request #9569 from Incoming5643/readthisgoddamnit
makes the "don't kill the guy who animated your statue" message huge
2015-05-24 01:02:03 +02:00
phil235
7c44e23f66 Fixes runtime from laser tag firing pin auth fail message.
Fixes null.return_air runtime when air alarm is destroyed while being interacted with.
2015-05-23 02:25:01 +02:00
xxalpha
aab00c4075 Fixed changeling revival not setting stat to CONSCIOUS.
FIXED IT

Changelog.
2015-05-21 23:51:10 +01:00
phil235
37abaffb50 Merge pull request #9431 from Incoming5643/wizard_fizard
Blacklists a few races to make spontanious race changes suck a little less
2015-05-21 15:52:48 +02:00