Commit Graph

15532 Commits

Author SHA1 Message Date
Andrew
89ed652d89 Allows Click Dragging for Cryo and Cloner
Patients can now be click dragged by themself or another into a
cryogenics pod or cloning scanner. This allows cyborgs to use this
equipment without external assistance.
2017-07-23 10:06:02 -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
Anewbe
f7f6280d48 Fixes Overload 2017-07-22 18:55:13 -05:00
silveryferret
f6af2c7733 Fixes slight oversight during copypasting from Europa's R-UST code. 2017-07-21 23:29:31 -04: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
Belsima
a3319de4f4 Adds a load of lore-friendly drinks & adjusts existing descriptions. (#3588)
* adds a load of lore-friendly drinks

* changelog

* uncomments radioactive drinks

:(

* nuka cola comeback

* Fixes the pull request.

* Makes drinks a bit more powerful.
2017-07-18 22:28:35 -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
2426bf7b0c Merge pull request #3605 from LorenLuke/IEC-TLC
Gives IECs some TLC
2017-07-18 16:23:35 -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
LorenLuke
14ad0d70e3 See changelog. 2017-07-16 02:58:52 -07:00
Neerti
b7df8d0b90 Merge pull request #3602 from Anewbe/conversion_tweak
Lowers the hallucinations from the conversion rune
2017-07-16 04:26:45 -04:00
Neerti
3d327533e8 Merge pull request #3599 from Anewbe/electric_welders
Electric Welders can be charged properly
2017-07-15 20:45:31 -04:00
Anewbe
96890cad1b Lowers the hallucinations from the conversion rune 2017-07-15 16:15:08 -05:00
Anewbe
b220cf3c2f Merge pull request #3597 from PrismaticGynoid/intellicores
Replaces intelliCards with intelliCores.
2017-07-15 14:48:36 -05:00
Anewbe
5f5f415fa0 Adds cargo jobs to the ID console 2017-07-13 19:53:16 -05:00
Anewbe
7bf0fb7da8 Electric Welders can be charged properly 2017-07-13 17:50:20 -05: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
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
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
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
Anewbe
bbfb6f01fe Merge pull request #3555 from Woodratt/WR_6302017_Mapstuff
Woodrat breaks map stuff
2017-07-06 17:43:09 -05:00
Anewbe
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
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
Anewbe
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
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
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
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
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