Commit Graph
34232 Commits
Author SHA1 Message Date
AnewbeandGitHub c64f7c9fa3 Merge pull request #3505 from Dhaeleena/Somecat
Winter boots
2017-07-09 17:13:27 -05:00
AnewbeandGitHub be8c644e07 Merge pull request #3565 from Neerti/7/6/2017_jammers
Adds Radio Jammers to Traitor Uplink
2017-07-09 16:15:42 -05:00
AnewbeandGitHub 3332584fc3 Merge pull request #3566 from Neerti/7/7/2017_removes_draft_dodging
Removes Forced Antag Draft
2017-07-09 16:11:38 -05:00
AnewbeandGitHub c1da073906 Merge pull request #3571 from SpadesNeil/tree-layer-fix
Fixes layering issue with tree icons
2017-07-09 14:06:46 -05:00
AnewbeandGitHub 856a927f41 Merge pull request #3573 from Anewbe/loaded_kits
Assorted map tweaks
2017-07-08 16:21:20 -05:00
Anewbe 649144b074 Swaps the security gun spawns for the right ones. 2017-07-08 16:13:40 -05:00
Anewbe 11e67f9a69 Assorted map tweaks 2017-07-08 16:06:12 -05:00
AnewbeandGitHub cf09e7f55c Merge pull request #3570 from Belsima/master
Enables unused cypherkey sprites.
2017-07-08 14:48:02 -05:00
AnewbeandGitHub 51e6d03c75 Merge pull request #3564 from RezRaz/master
Fixes RIGsuits for skrell.
2017-07-08 14:47:47 -05:00
AnewbeandGitHub 128358e153 Merge pull request #3567 from Neerti/7/7/2017_communicator_ghost_sound
Communicator Ghost Message Sounds
2017-07-08 14:45:56 -05:00
AnewbeandGitHub aa164f4a99 Merge pull request #3568 from Belsima/swimsuits
Adds a striped swimsuit.
2017-07-08 14:44:42 -05:00
Spades 1398accaf9 You know what, let's play it safe. 2017-07-08 11:13:56 -04:00
Spades 7bc1d92d61 Fixes layering issue with tree icons
I've discovered from using it on the tether map in Vorestation that it
being on layer **9** is really unneccessary and it just looks absurd
when layered over other things.

I don't think you actually use trees for anything right now, but
whenever you do, you'll want this to prevent them from looking dumb.
2017-07-08 11:11:57 -04:00
Andromeda-K22andAnewbe 760dce00fa Shotgun additions and minor tweaks (#3554)
* 24-round shotgun mag fixes + making it relevant.

Adds the AS-24 Shotgun to the traitor uplink for 100 TCs, also makes automatic shotgun magazines costs the appropriate amount (13,000 metal up from 2200)

* Magazine variety.

Nothing really new here. Beanbag / pellet mags for the admin-only AS-24.

* shotgun 6-shell clips, autolathe and shotgun tweaks.

+6-shell quickloader clips for shotguns, with proper metal costs for slugs, beanbags and buckshot.

+minor tweak to shotguns to allow the quickloaders to work in a non-silly way (load_method = SINGLE_CASING|SPEEDLOADER) since there are literally no other shotgun speedloaders this probably shouldn't be an issue (as it's ever so slightly quicker than loading with a box)

+added sprites for quickloading clips.

* Requested changes.

-6 round shotgun clip sprites
+4 round shotgun clip sprites
-/+ adjusted shotgun clips to 4 rounds

* cherrypicking

* fixes

did a bad

* literally a number
2017-07-07 15:12:32 -05:00
BelsimaandGitHub af50a17e3f Merge pull request #1 from Belsima/cypherkeys
Enables unused encryption key sprites.
2017-07-07 13:53:56 -04:00
Belsima 770afea46b Enables unused encryption key sprites. 2017-07-07 13:52:04 -04:00
Belsima 132f548c3a Adds a striped swimsuit. 2017-07-07 13:13:50 -04:00
Neerti 9a08825681 Receiving Communicator messages and voice requests as a ghost now plays sounds to the ghost, which may help them notice in their chatlog. 2017-07-07 01:01:48 -04:00
Neerti b30107c859 Removes Forced Antag Draft
Comments out the code to force people into an antag role if they vote for the gamemode, in an effort to have more people join at roundstart.
2017-07-07 00:23:59 -04:00
Neerti bc40a45cc4 Adds Radio Jammers to Traitor Uplink
Subspace Jammers can be bought in the traitor uplink for 25 TC.  They are already in the code, but this PR adds them to the uplink.

This PR also adds a power meter to the sprite, as a small QoL change.

They run off of weapon cells and one cell will last for about a minute.
2017-07-06 21:20:10 -04:00
AnewbeandGitHub bbfb6f01fe Merge pull request #3555 from Woodratt/WR_6302017_Mapstuff
Woodrat breaks map stuff
2017-07-06 17:43:09 -05:00
AnewbeandGitHub 387b04f50a Merge pull request #3562 from Neerti/7/5/2017_ai_detector
Adds the Anti-Surveillance Tool for Traitors.
2017-07-06 17:21:26 -05:00
RezRazandGitHub cabec253ae Add files via upload 2017-07-06 14:48:08 -05:00
AnewbeandGitHub 60d73dfa63 Merge pull request #3561 from SpadesNeil/38-soundfix
Fixes sounds for .38 guns
2017-07-06 13:48:03 -05:00
AnewbeandGitHub 04dffa15e6 Merge pull request #3563 from Neerti/7/5/2017_communicator_spying_please_no
Fixes Communicator Spying Exploit
2017-07-06 13:47:38 -05:00
Neerti 37cd5f8aec Fixes uplink duplicate path. 2017-07-06 11:55:36 -04:00
Neerti 2723e153d5 Fixes Communicator Spying Exploit
Makes it so you can no longer see everyones' communicator cameras by modifying a camera console board.
2017-07-05 21:35:02 -04:00
Neerti 005ef28f13 Adds the Anti-Surveillance Tool for Traitors.
Adds a traitor device to warn the traitor if they're being spied or are about to be spied on by the AI or anyone using a camera console.
It will warn the holder by changing color, beeping a specific tone, and sending a message to their chat log.  It only does this when the state of spying changes, so it will not spam the chatlog if nothing changes.  Only the holder can hear the warnings.  It also functions like a regular multitool.
2017-07-05 21:18:52 -04:00
Spades 9a43b88d90 Fixes sounds for .38 guns
They should not sound like the machine gun used to.

Also the LeMat now changes sound depending what firing mode you're in.
2017-07-05 20:28:44 -04:00
AnewbeandGitHub 087983a225 Merge pull request #3560 from Neerti/7/5/2017_rename_infiltrators
Renames Infiltrator gamemode to Team Traitor
2017-07-05 19:12:16 -05:00
AnewbeandGitHub 1421de2ad6 Merge pull request #3558 from Cameron653/NUKA_COLA_FIX
Nuka cola effect fix.
2017-07-05 19:12:01 -05:00
AnewbeandGitHub 009d7b7496 Merge pull request #3559 from Neerti/7/4/2017_cult_automute_pls_go
Makes automute less prone to mute cultists.
2017-07-04 23:52:51 -05:00
Neerti 46d96ed244 Renames Infiltrator gamemode to Team Traitor
Changes the name to make it more obvious to players what the gamemode is, as I'm told that it might be confusing and make people think it's ninja+traitor.
2017-07-05 00:17:17 -04:00
Neerti beccda6866 Makes automute less prone to mute cultists. 2017-07-04 23:20:44 -04:00
Cameron653andGitHub 0a3a043cb6 Updates the block list in lunch.dm 2017-07-04 20:13:14 -04:00
Cameron653andGitHub 74107add10 Makes nuka cola great again. 2017-07-04 19:48:03 -04:00
AnewbeandGitHub 90586ec2ac Merge pull request #3556 from Nalarac/Defib
Readds Jumper Cable Kits
2017-07-04 17:02:36 -05:00
AnewbeandGitHub 457967ffc6 Merge pull request #3548 from Cameron653/STRONGER_MUTAGENIC_CHEMICALS
Mutagenic chemicals tweak
2017-07-04 17:01:59 -05:00
AnewbeandGitHub 1574f537a2 Merge pull request #3557 from SpadesNeil/44-mag-sprite-reeeeee
Fixes .44 mag sprite, again
2017-07-04 17:00:36 -05:00
AtermoneraandAnewbe 6963227da2 Borgs can pick up slime cores (#3552)
* Borgs can pick up slime cores

* Borgs can pick up proximity sensors

* Should fix the travis issue?

* Should fix the travis issue?

* Queue fixes being eaten by Git
2017-07-04 16:51:25 -05:00
SpadesandAnewbe 9846f9169d Fixes mimic death() (#3551)
* Fixes mimic death()

I'm pretty sure this is not correctly done.

* This is broken too.
2017-07-04 16:51:08 -05:00
AnewbeandGitHub da84a50569 Merge pull request #3550 from Yoshax/materialscanner
Adds material scanner and prescription ones to loadout
2017-07-04 16:51:01 -05:00
Spades b9798b99da Fixes .44 mag sprite, again
reeeeeeeeeeeeeeeeeeee
2017-07-04 17:49:52 -04:00
Andrew 378bb4af49 Readds Jumper Cable Kits
+Readds jumper cable kits to revive FBPs (Robotics will spawn with these
without any map changes but they will be empty so that needs to be fixed
anyways)
+Readds jumper cable kits to cargo orders
-Lowers jumper cable kits in order to 2 from 4 to be in line with the
defibrillator changes
+Adds robot defibrillators to both medical modules
+Adds robot jumper cables to research module
+Adds some new icons for jumper cables to fit in better with the new
defibrillator sprites
2017-07-03 18:33:48 -05:00
Woodratt e75c3887b7 Woodrat breaks map stuff
Added SC map files for further work. Including hopefully all the related files.

New airlock sprite thanks to Virgo, with a alternate non-see through sprite.

Changes to the space and transit tiles (ported from bay).

Changes done to the NC map that should bring it more up to date with changes (shield defuse stuff and minor bug fixes)
2017-07-02 18:53:17 -07:00
AnewbeandGitHub e5d796b040 Merge pull request #3533 from Yoshax/contender
Adds in the Thompson Contender
2017-07-01 13:55:44 -05:00
Yoshax 020c1d7d88 Adds material scanner and prescription ones to loadout 2017-06-30 23:56:44 +01:00
Cameron653andGitHub a35f759e4c Mutagenic chemicals tweak 2017-06-28 15:32:13 -04:00
NeertiandGitHub 7164f8ed23 Merge pull request #3540 from Nalarac/master
Makes Engineer Borgs Great Again
2017-06-27 15:45:44 -04:00
AndrewandGitHub 3a089ab8a6 Merge branch 'master' into master 2017-06-25 18:10:33 -05:00