Commit Graph

15801 Commits

Author SHA1 Message Date
Anewbe
dc20e77633 Merge pull request #3595 from Nalarac/Robot
Cyborg Item Changes
2017-07-12 23:23:05 -05:00
Anewbe
8bac0c6a64 Merge pull request #3582 from Anewbe/sleeves_flannel
Rolling sleeves on flannel shirts now uncovers your arms
2017-07-12 23:18:21 -05:00
Andrew
484fce865c Merge remote-tracking branch 'refs/remotes/PolarisSS13/master' into Robot 2017-07-11 20:09:47 -05:00
Andrew
4b0549f946 Cyborg Item Changes
Research Cyborg
-Science gripper can now pick up health analyzers
-External organ gripper renamed to robotics organ gripper
-Robotics organ gripper can hold synthetic eyes
-Picking up brains has been moved to robotics organ gripper

Medical Cyborgs
-Chemistry gripper renamed to medical gripper
-Medical gripper can now hold pills and blood bags
-Crisis cyborgs now have crisis hyposprays which include dylovene
-Crisis cyborgs now have advanced burn and trauma kits instead of bruise
packs and ointment
-Surgeon cyborgs now have medical grippers
-Surgeon cyborgs now have surgeon hyposprays which replace tramadol with
oxycodone
-Oxycodone has been made scannable by health analyzers
-Surgeon cyborgs given a dropper to do the necrosis removal operation

Service Cyborgs
-Now have a multitool to cryogenically freeze plants
2017-07-11 20:09:19 -05:00
Anewbe
3648aa0348 Tweaks Hawaiian shirts and sweaters 2017-07-11 14:39:44 -05:00
Anewbe
4e93ac107f Merge pull request #3584 from Belsima/pens
Adds a fountain pen.
2017-07-11 11:24:27 -05:00
Anewbe
760a4da4af Merge pull request #3583 from Belsima/sweaters
Adds a boatload of sweaters.
2017-07-11 11:24:15 -05:00
Belsima
1d7cea9864 renames a mislabelled pen 2017-07-10 18:07:07 -04:00
Belsima
b7a34a3645 Adds a gilded pen. 2017-07-10 18:01:43 -04:00
Belsima
1afadcabfc removes BAD comment 2017-07-10 17:51:16 -04:00
Belsima
c0d22058b4 Adds a boatload of sweaters. 2017-07-10 17:49:22 -04:00
Anewbe
2d39010c3d Merge pull request #3575 from LorenLuke/simple-derobusto
De-robusts simple animal attacks
2017-07-10 16:49:08 -05:00
Neerti
a47584fdb0 Merge pull request #3576 from Anewbe/medical_gowns
Adds medical gowns
2017-07-10 17:48:31 -04:00
Anewbe
da004981e6 Rolling sleeves on flannel shirts now uncovers your arms 2017-07-10 16:44:57 -05:00
LorenLuke
8ee79ec299 Reduced chance to miss base from 40% to 25%. 2017-07-09 16:19:32 -07:00
Anewbe
4f1760689d Fixes a typo 2017-07-09 17:18:36 -05:00
Anewbe
c64f7c9fa3 Merge pull request #3505 from Dhaeleena/Somecat
Winter boots
2017-07-09 17:13:27 -05:00
Anewbe
252f3af8ad Adds medical gowns 2017-07-09 15:03:11 -05:00
LorenLuke
e48d79c5e3 Adds small delay to simple_animal attack logic, and gives their attacks a miss probability. 2017-07-09 11:51:43 -07:00
Anewbe
aa164f4a99 Merge pull request #3568 from Belsima/swimsuits
Adds a striped swimsuit.
2017-07-08 14:44:42 -05:00
Andromeda-K22
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
Anewbe
bbfb6f01fe Merge pull request #3555 from Woodratt/WR_6302017_Mapstuff
Woodrat breaks map stuff
2017-07-06 17:43:09 -05:00
Anewbe
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
Anewbe
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
Cameron653
0a3a043cb6 Updates the block list in lunch.dm 2017-07-04 20:13:14 -04:00
Cameron653
74107add10 Makes nuka cola great again. 2017-07-04 19:48:03 -04:00
Anewbe
90586ec2ac Merge pull request #3556 from Nalarac/Defib
Readds Jumper Cable Kits
2017-07-04 17:02:36 -05:00
Anewbe
457967ffc6 Merge pull request #3548 from Cameron653/STRONGER_MUTAGENIC_CHEMICALS
Mutagenic chemicals tweak
2017-07-04 17:01:59 -05:00
Anewbe
1574f537a2 Merge pull request #3557 from SpadesNeil/44-mag-sprite-reeeeee
Fixes .44 mag sprite, again
2017-07-04 17:00:36 -05:00
Atermonera
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
Spades
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
Anewbe
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
Anewbe
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
Cameron653
a35f759e4c Mutagenic chemicals tweak 2017-06-28 15:32:13 -04:00
Andrew
3a089ab8a6 Merge branch 'master' into master 2017-06-25 18:10:33 -05:00
Anewbe
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
Anewbe
b3f294efd2 Merge pull request #3523 from Yoshax/whythehellisthislikethisandwhydidnobodymentionitbefore
Nerfs the siemens on most hardsuits
2017-06-25 16:30:06 -05:00
Anewbe
81e7d9ce42 Merge pull request #3513 from Belsima/snowsuit
Adds snowsuits.
2017-06-25 16:27:43 -05:00
Anewbe
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