Commit Graph

6306 Commits

Author SHA1 Message Date
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
Anewbe
31bc1f757f Merge pull request #3635 from LorenLuke/Bomb-Consistency
Tank/TTV Consistency improvement
2017-07-25 16:44:45 -05:00
LorenLuke
3a80ffa080 Fixes inconsistent behavior by TTVs and STBs. 2017-07-24 10:28:20 -07:00
Anewbe
a5114f99dd Embiggens the laundry baskets 2017-07-23 16:33:02 -05:00
Anewbe
196212faee Merge pull request #3614 from silveryferret/Polaris-R-UST-Port
R-UST Port, now in Polaris flavor.
2017-07-23 11:25:24 -05:00
Anewbe
91b06c20d1 Merge pull request #3622 from LorenLuke/tank-runtime-fix
Fixes a div/0.
2017-07-23 00:25:35 -05:00
LorenLuke
bc972c86e8 Fixes a div/0. 2017-07-22 22:05:45 -07: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
silveryferret
7567726c07 Ports R-UST from Baystation12 + small admin debug verb 2017-07-19 20:33:16 -04:00
Anewbe
7669c83dfa Merge pull request #3607 from LorenLuke/one-tank-bomb
Changes Single-Tank-Bomb behavior.
2017-07-19 14:01:36 -05:00
Cameron653
e158fcd3cc Macro Replacements. (#3574)
* A preface to my madness

Travis failed one of my PR's because I copied old code
that used /red /blue /green.

Because of this, I am going to find and replace every
instance of it that I find.

Also this is a test commit to make sure I'm comitting
to the correct branch.

* /blue /green /red replacements

Dear god.

A slow and painful death from acid is more fun than this.

I wouldn't wish this torture on my worst enemy.
And this is only the beginning

* Replace part 2.

Time to fix the human error.

* Fixes mismatches

* Sets macro count to 220

One above the current number of macros in the code.

* Fixes last of the mismatches.

* Removes spaces, replaces \black

Removes spaces
Replaces \black in a few areas where seen
Replaces \bold with <B> </B> where seen

* Updating macro count again

* More fixes!

* Issues fixed! For real this time!

I swear!

* Fixing all the merge conflict files.
2017-07-19 12:47:23 -05:00
Anewbe
d7875f5377 Merge pull request #3609 from Belsima/legwarmers
Adds a load of zippos to the loadout.
2017-07-18 16:27:09 -05:00
Anewbe
b22a9fa575 Merge pull request #3589 from Belsima/gloves
Adds fingerless gloves.
2017-07-17 15:42:28 -05:00
Belsima
a291ae9889 Adds a load of zippos to the loadout. 2017-07-17 14:57:14 -04:00
LorenLuke
b7f5362276 See https://github.com/Baystation12/Baystation12/pull/14404.
(ignore point 13)
2017-07-16 16:03:31 -07:00
PrismaticGynoid
ad6e395ae2 Replaces intelliCards with intelliCores.
Sprites replaced with a black box that could conceivably contain a brain, while obscuring the details. Complete with screen and convenient handle.
Usage text modified to make sense for MMIs/posibrains, instead of just drone brains (e.g. downloaded → transferred).
Description added to the new intelliCores. Made into normal-sized item, similar to MMIs/posibrains.

This is an alternative to either changing lore to allow for brain uploading, or changing code to allow for choosing multiple AI brain types.
2017-07-13 00:14:34 -07:00
Belsima
e51de25dea Adds fingerless gloves. 2017-07-11 00:49:02 -04:00
Neerti
a47584fdb0 Merge pull request #3576 from Anewbe/medical_gowns
Adds medical gowns
2017-07-10 17:48:31 -04:00
Anewbe
c64f7c9fa3 Merge pull request #3505 from Dhaeleena/Somecat
Winter boots
2017-07-09 17:13:27 -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
252f3af8ad Adds medical gowns 2017-07-09 15:03:11 -05:00
Anewbe
c1da073906 Merge pull request #3571 from SpadesNeil/tree-layer-fix
Fixes layering issue with tree icons
2017-07-09 14:06:46 -05:00
Anewbe
cf09e7f55c Merge pull request #3570 from Belsima/master
Enables unused cypherkey sprites.
2017-07-08 14:48:02 -05:00
Anewbe
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
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
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
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
Anewbe
bbfb6f01fe Merge pull request #3555 from Woodratt/WR_6302017_Mapstuff
Woodrat breaks map stuff
2017-07-06 17:43:09 -05: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
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
12be304ba4 Merge pull request #3528 from VOREStation/aro-pol-defibs
Ports Bay/Paradise Defibs
2017-06-25 16:15:01 -05:00
Anewbe
2bd869026a Merge pull request #3534 from Neerti/6/13/2017_infiltrators
Adds a new Infiltrator Gamemode (Team Traitor)
2017-06-24 12:32:16 -05:00
Neerti
dbdc88dd88 Adds a new Infiltrator Gamemode (Team Traitor) 2017-06-16 18:03:10 -04:00
Anewbe
99320866b0 Merge pull request #3530 from VOREStation/qdel-hints-gen-4
Qdel Hints Round IV
2017-06-16 16:21:58 -05:00
Anewbe
7cb81853a4 Merge pull request #3529 from VOREStation/qdel-hints-gen-3
Qdel Hints Round III
2017-06-16 16:17:33 -05:00
Leshana
6a0cc39419 Fixes objects using walk_to() not being able to be garbage collected.
* Okay evidently walk_to(A, B) doesn't stop when A reaches B, but keeps running in the background forever until it is manually canceled!  Therefore in order to be garbage collected, we must cancel walking on any object that might have initiated it.
* Fixes this on chemsmoke and spiders.
* The same story applies to walk_towards; fixed for dust, meteors and immovablerod, and also to walk_away; fixed for flashbangs.
* Also fixed chemsmoke actually getting qdeled at the right time.
2017-06-16 13:40:15 -04:00
Leshana
c91dc333cd Some more types which need Destroy to return qdel hints! 2017-06-14 01:13:54 -04:00
Leshana
4b46703d9d A plethora of Destroy() fixes - return qdel hints and clean stuff up. 2017-06-14 01:07:35 -04:00
Arokha Sieyes
836970e310 emag_act tweak since Bay's is different 2017-06-13 11:45:50 -04:00
Arokha Sieyes
69a95cce08 Tweak defib time and damage 2017-06-13 10:22:16 -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
Anewbe
5d81148ab8 Merge pull request #3511 from VOREStation/garbage-subsystem
tg Garbage Subsystem
2017-06-10 17:20:22 -05:00
Anewbe
7a4e1fe3dc Merge pull request #3508 from VOREStation/aro-pol-commqol
Communicator QOL Tweak
2017-06-07 16:24:42 -05:00
Arokha Sieyes
ade7f6c1cd Communicator QOL Tweak
Call/Msg buttons on contacts list
2017-06-06 01:03:08 -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
733f69a474 Remove redundant cleanup of /atom/var/reagents
* /datum/reagents/Destroy() does everything /datum/reagents/delete() does and more, and delete() is called only from /obj/effect/Destroy() which is *itself* redundant with its parent /atom/movable/Destroy()
2017-06-05 22:10:07 -04:00