Commit Graph
15783 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 aa164f4a99 Merge pull request #3568 from Belsima/swimsuits
Adds a striped swimsuit.
2017-07-08 14:44:42 -05: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
Belsima 132f548c3a Adds a striped swimsuit. 2017-07-07 13:13:50 -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 60d73dfa63 Merge pull request #3561 from SpadesNeil/38-soundfix
Fixes sounds for .38 guns
2017-07-06 13:48:03 -05: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 1421de2ad6 Merge pull request #3558 from Cameron653/NUKA_COLA_FIX
Nuka cola effect fix.
2017-07-05 19:12:01 -05: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
AndrewandGitHub 3a089ab8a6 Merge branch 'master' into master 2017-06-25 18:10:33 -05:00
AnewbeandGitHub 2dd8f33ecd Merge pull request #3543 from Neerti/6/24/2017_aooc_for_nonadmins
Adds AOOC functionality for antags.
2017-06-25 16:34:15 -05:00
AnewbeandGitHub b3f294efd2 Merge pull request #3523 from Yoshax/whythehellisthislikethisandwhydidnobodymentionitbefore
Nerfs the siemens on most hardsuits
2017-06-25 16:30:06 -05:00
AnewbeandGitHub 81e7d9ce42 Merge pull request #3513 from Belsima/snowsuit
Adds snowsuits.
2017-06-25 16:27:43 -05:00
AnewbeandGitHub a5f0569a2d Merge pull request #3541 from SpadesNeil/AcesFixesThingses
More Munition Caliber Naming Fixes
2017-06-25 13:14:18 -05:00
Neerti 795fcd6306 Fixes Inability to use Say/LOOC/Other Things
A null entry somehow got into ```player_list```, which caused an important proc called ```get_mobs_and_objs_in_view_fast()``` to fail.  The cause appeared to be a brain mob failing to qdel, then failing to ```logout()```, leaving a null entry in ```player_list```.
```get_mobs_and_objs_in_view_fast()``` now makes sure every entry it iterates over exists, and this should fix the qdel issue as well.
2017-06-24 18:18:10 -04:00
Neerti 1cfd2f08f2 Adds AOOC functionality for antags.
AOOC can be granted on a per-antag type basis.  If the type has can_use_aooc equal to true, they can both use and see AOOC.  It is true by default to allow for the upcoming Infiltrator type to automatically be able to use it.
The types disallowed from AOOC are ERT, Traders, and Renegades.  This means admins can now use AOOC to talk to the real antags and not the ERT.
2017-06-24 12:31:18 -04:00
Yoshax dc094fde90 Fixes things 2017-06-20 14:12:36 +01:00
Spades 21889e4991 One more because I forgot to click save 2017-06-20 01:15:12 -04:00
Spades 3da257d984 Merge remote-tracking branch 'refs/remotes/PolarisSS13/master' into AcesFixesThingses 2017-06-20 01:04:22 -04:00
Spades 79e192f565 Missed a few things. 2017-06-20 01:04:07 -04:00
NeertiandGitHub 12543dd138 Merge pull request #3537 from Cameron653/AHF
Makes artifact_harvesters have a detection delay on spawn
2017-06-20 01:01:41 -04:00
NeertiandGitHub 5d9a91df63 Merge pull request #3510 from FTangSteve/engieBorg
Ports inflatable dispensers from Bay
2017-06-20 00:56:23 -04:00
NeertiandGitHub 470c80e8eb Merge pull request #3448 from Anewbe/ling_claws
Adds ling claw power
2017-06-20 00:54:23 -04:00
Spades be2a99ca32 Some ammo fixes
- Fixes pirate gun not getting 12g caliber correctly.
- Fixes .357 caliber not being named consistently with everything else.
(Do not merge this until
https://github.com/PolarisSS13/Polaris/pull/3533 is merged pls, unless
Yosh fixes his caliber to be correct also.)
- Changes .50AE ammo to .44 because that's more consistent with what the
gun is capable of in-game, because it uses the same damage values as the
.357 and not a bullet that shoots through through your fridge, through
your house, and hits your neighbor's home invader like a .50AE is IRL.
The fact that it's .44 makes much more sense. This is purely a fluff
change because it annoyed me.
- Fixes a bunch of ammo.dmi icon names and makes the file not a jumbled
fucking mess. This means now your 762 mags and the newly renamed 44 mags
will not be broken anymore.
2017-06-19 23:44:01 -04:00
Andrew 5c63a3ac71 Gives Research Borgs Rapid Part Exchanger
Gives the research borg module the rapid part exchange device so it can
easily upgrade machines without having to take it apart and slowly put
the pieces back in (with some of these machines being bugged and unable
to be deconstructed like the circuit imprinter).
2017-06-19 17:52:06 -05:00
Andrew de7bae13ab Makes Engineer Borgs Great Again
Gives construction module exclusive items to the engineering module and
comments out the construction module.
2017-06-19 00:21:11 -05:00
Cameron653andGitHub a910ed7ebb Removes a comma that allowed nuka_cola to spawn in
No fun allowed.
2017-06-17 00:09:58 -04:00
Cameron653andGitHub b3ff070f17 Adds a small delay to the artifact_harvester 2017-06-17 00:06:53 -04:00
Belsima a62c91ebd3 Appeases the mergelords. 2017-06-16 20:27:08 -04:00
AnewbeandGitHub 3997a1510a Merge pull request #3526 from VOREStation/stonedmc-update
StonedMC Update & Hookup
2017-06-16 16:22:26 -05:00
AnewbeandGitHub 99320866b0 Merge pull request #3530 from VOREStation/qdel-hints-gen-4
Qdel Hints Round IV
2017-06-16 16:21:58 -05:00
AnewbeandGitHub 7cb81853a4 Merge pull request #3529 from VOREStation/qdel-hints-gen-3
Qdel Hints Round III
2017-06-16 16:17:33 -05:00
Yoshax 568c7f10be Adds in the Thompson Contender 2017-06-16 19:59:53 +01:00
AnewbeandGitHub d8c06c0b34 Merge pull request #3514 from Yoshax/rigsuit
Makes the CEs hardsuit and Engineering hardsuit temperature resistant
2017-06-15 20:26:57 -05:00
AnewbeandGitHub 94522eb04f Merge pull request #3503 from MatchaFrappe/master
Adds a sexy maid uniform~!
2017-06-14 17:31:39 -05:00
AnewbeandGitHub 37a33fa06d Merge pull request #3522 from VOREStation/xgm-lazy-lists
XGM init() and lazy list optimization
2017-06-14 16:05:23 -05:00