Commit Graph

1464 Commits

Author SHA1 Message Date
Belsima
7665588e4e Adds a tiedye shirt. 2017-08-23 03:38:48 -04:00
MagmaRam
1546b25f4c Merge pull request #3698 from Belsima/fbps
Adds Grayson Manufactories FBPs.
2017-08-20 21:27:50 -06:00
Anewbe
676fb6daf6 Merge pull request #3694 from SpadesNeil/gun-stuff
Gun stuff. Some fixes, some changes, and a shiny new SVD
2017-08-20 11:21:50 -04:00
Neerti
e209c2c707 Merge pull request #3717 from Cyantime/cheaperteg
Reduces TEG price.
2017-08-17 11:52:29 -04:00
Cyantime
80ec86a07c Reduces TEG price. 2017-08-16 10:50:10 -04:00
Belsima
31f9127cf9 Adds Grayson Manufactories FBPs. 2017-08-10 14:38:33 -04:00
Spades
6b02206adf Sniper Changes and Fixes
- Fixes the heavy sniper hand sprite so it no longer looks like a
pistol. Not ideal, but better.
- Changes energy sniper to use the Z8's hand sprite, because it's more
distinct than looking the same as the laser carbine.
- Adds the SVD back by request of Woodrat. It's not spawnable yet, since
I don't know where you want to balance it.
2017-08-09 21:04:58 -04:00
Neerti
01856579d1 Merge pull request #3681 from LorenLuke/Antag-fix
Allows team traitor and autotraitor to order AM rifle.
2017-08-05 19:39:31 -04:00
LorenLuke
f3b2ddd80c Fixes typo. 2017-08-05 15:28:42 -07:00
LorenLuke
36b0d0bfcc Allows team traitor and uato traitor to order AM rifle. 2017-08-05 15:06:20 -07:00
Anewbe
1a7d47fc6b Merge pull request #3676 from Neerti/8/3/2017_tool_update
Updates Tools
2017-08-04 14:05:06 -05:00
Neerti
4256ec902a Changes path of alien tools, adds hacking sounds, and makes the fireaxe cabinet use toolspeed. 2017-08-04 08:35:16 -04:00
Neerti
b2f5b758f1 Hopefully fixes merge conflicts. 2017-08-01 16:18:43 -04:00
Neerti
36b0f5fa99 Even More Circuit Changes
See PR for changes.
2017-08-01 16:13:27 -04:00
LorenLuke
2f481de07d Bugfix. 2017-07-30 22:51:03 -07:00
silveryferret
786c21c66e Fixes build_path variable, tweaks required components for R-UST parts, adds supply packs for R-UST things 2017-07-29 05:26:07 -04:00
LorenLuke
31e90bfeed Adds Collapsible AM rifle. Createes new uplink entry (#3644)
* Adds Collapsible AM rifle, and adds case with parts and 5 shots to Uplink. Separates it and intended merc version, both costing default telecrystal amount. Does NOT make them antagonist type specific.

* Addresses review.

* Makes rifle case traitor/merc specific. Enables ability to have specific uplink items be available only for specific antags.
2017-07-28 16:06:20 -05:00
MagmaRam
ded94ef66c Merge pull request #3643 from Anewbe/monkey_cubes
Adds monkey cubes to the traitor uplink
2017-07-28 15:18:30 -05:00
Cameron653
97957fcaee Replaces more macros. (#3647)
* MORE MACRO CHANGES

AHHHHHHHHHHHHHHHHHHHH

* Fixes a few typos

* Fixes compile error

* Fixes for real

* 4 macros left that I can't find
2017-07-27 21:12:21 -05:00
Anewbe
c3945440c6 Adds monkey cubes to the traitor uplink 2017-07-25 17:55:02 -05:00
Anewbe
f0d9bb5dce Adds the weapon swaps to the uplink 2017-07-22 15:01:18 -05:00
Anewbe
ab5e716624 Merge pull request #3617 from SpadesNeil/centcom-not-centcomm
CentCom not centcomm
2017-07-22 13:30:06 -05:00
Spades
7e4417d31f It's CentCOM not CentCOMM
I swear to god I have fixed this like three times already and somehow it
keeps coming back.
2017-07-21 04:29:39 -04:00
Spades
2e776ac645 Changes 5.56mm to 5.45mm, now 20% less stupid
The same as https://github.com/PolarisSS13/Polaris/pull/3612 except this
time I'm not a dumbass and accidentally overwriting other changes
because the Github client decided not to sync with Polaris.
2017-07-19 14:24:50 -04:00
Anewbe
27284d3687 Merge pull request #3577 from Anewbe/shotgun_fix
Fixes slugs being available in an unhacked autolathe
2017-07-12 23:17:54 -05:00
Anewbe
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
Anewbe
e6d949c049 Fixes slugs being available in an unhacked autolathe 2017-07-09 15:43:17 -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
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
Neerti
37cd5f8aec Fixes uplink duplicate path. 2017-07-06 11:55:36 -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
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
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
12be304ba4 Merge pull request #3528 from VOREStation/aro-pol-defibs
Ports Bay/Paradise Defibs
2017-06-25 16:15:01 -05: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
Spades
21889e4991 One more because I forgot to click save 2017-06-20 01:15:12 -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
Arokha Sieyes
fad93cf366 Ports Bay/Paradise Defibs
I like the ones I wrote, but these are proooobably better.

They have normal units, which are worn on the back and you can grab the paddles out of to shock people.
Then there's compact units, which are worn as a belt, and serve the same purpose.
And finally there's the combat units, which allow revives through spacesuits, and have no safety so you can zap living people on harm intent (good for antags? CMO?).

These appropriately check for blood, a heart, etc. So, in that way, they're a bit more realisic than my original ones which I was sorta lazy in writing.
Emagging them turns off the safeties, allowing them to zap people who are still alive.

I actually cleaned up their sprite choice code a little and added a sprite for the 'combat' one since previously it was just the emagged sprite (flashing exclamation point). Now it's just got a red heart monitor, and the emagged ones keeps the exclamation.

Did make one balance change in that compact ones use twice the power (inefficient small capacitors? or something?).
2017-06-12 14:51:39 -04:00
Leshana
c4c5dc098a Fix runtimes in radiation controller
* Fixes Baystation12/Baystation12/issues/17443 - Runtime in radiation.dm,30: illegal: sqrt(-2.857143)
  * Updating radiation power to below zero should simply delete the source.
* Fixes at least one cause of Runtime in radiation.dm,41: Cannot read null.z in an effort to fix Baystation12/Baystation12/issues/17411
2017-06-11 20:50:13 -04:00
Leshana
e48b548f2b More and more Destroy() cleanups all across the board - Return qdel hints. 2017-06-05 23:01:41 -04:00
Leshana
d4ebcac3f6 Update radiation system for the new garbage collector. 2017-06-05 22:10:07 -04:00
PsiOmegaDelta
ebe5cc916d Port of @PsiOmegaDelta's Baystation12/Baystation12#16820
Ports tg's garbage collector subsystem and Destroy() returning qdel hints.
2017-06-05 22:10:06 -04:00
Leshana
8315abb352 Fix issues with radiation controller on multi-z maps.
Radiation sources are by design z-level specific, the ray trace check needs to respect this.
2017-06-02 07:56:09 -04:00
Anewbe
0af77012c4 Merge pull request #3465 from Yoshax/radiation
Ports radiation rework and stuff from Bay
2017-05-31 18:37:58 -05:00
Leshana
2c8df87899 Tweak to Radiation Optimization
* Optimized garbage collection of radiation sources until we get qdel() hints.
* Made the RADIATION_LOWER_LIMIT configurable (option for people to save some cpu time)
* Added some comments and broke the proccessor into separate procs for profiling purposes
* Added a changelog.
2017-05-30 13:55:53 -04:00
Spades
3ff9d441f9 Finishes fixing ammo inconsistencies 2017-05-27 04:39:49 -04:00
Spades
8579adcc53 Naming convention of ammo is now consistent
s = Speedloaders. (Functionally the same as clips, but they're not
_really_ the same thing, just in case we change these later.)
c = Clips. (Can also be used to fill other magazines.)
m = Magazine. (Holds ammo rounds.)
a = Ammo. (Individual rounds of ammo.)
2017-05-26 19:32:23 -04:00
Leshana
34c73dab69 Optimization/Rewrite of Radiation Controller
* The performance of the radiation controller as-is was not fast enough for inclusion in production servers, but it has some nice featuers, so rewrote it to be more performant.
* Instead of storing the radiation strength for every turf, we only store the sources of radiation, and calculate the strength only for mobs who might be in range.
   * Old method was ray-tracing to every turf in range whether anything was there to be irradiated or not.  Could be hundreds of turfs.  New method only lazily calcualtes strength at a turf if we actually need to know it.   Often times this is zero turfs if nobody is standing in engineering.
  * Removed the automatic processing of objects with "rad_power" set.  Objects are responsible for calling the repository to create/update their radiation sources.   Saves some extra overhead that in practice was redundant with other process controllers.
  * Also tweaked to be more respectful of qdel'd objects and added some comments.
2017-05-25 18:43:56 -04:00
Leshana
e16a3f4b3d Updated crew monitor computer to support multi-z output and nanomaps. 2017-05-22 16:15:47 -04:00
Ben Reeve
6185bbd212 Unified radiation system 2017-05-22 16:24:34 +01:00