Commit Graph

7403 Commits

Author SHA1 Message Date
Anewbe
03df7a1eab Merge pull request #3608 from SpadesNeil/xenomeat-returns
Changes Spider meat back to Xeno meat
2017-07-19 12:47: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
14fb294e79 Merge pull request #3610 from Atermonera/Observer_icons
Adds various animal sprites to ghost icons
2017-07-18 20:20:02 -05:00
Atermonera
f334fbe3a2 Fucking commas 2017-07-17 17:02:02 -07:00
Atermonera
cd8b89d249 Adds various animal sprites to available ghost sprites 2017-07-17 16:40:54 -07:00
Spades
350fa74c14 Changes Spider meat back to Xeno meat
But also changes a bad design choice and makes spider meat a viable
alternative to recipes requiring Xeno meat.

Now, for those of us who do still use xenos for things, xeno meat isn't
suddenly completely useless, while spiders still produce their own
unique meat that is usable in these recipes.
2017-07-17 04:45:40 -04:00
Anewbe
b220cf3c2f Merge pull request #3597 from PrismaticGynoid/intellicores
Replaces intelliCards with intelliCores.
2017-07-15 14:48:36 -05:00
Belsima
29d0442f76 Adds a buncha robot sprites. (#3585)
* Adds a buncha robot sprites.

* Adds a changelog for the robot sprites.

* i missed a comma :(

* at least im not the only failure

* fixes inconsistent NOBLE arms
2017-07-14 14:52:48 -05:00
PrismaticGynoid
7bc811fec0 Also changes the wipe_core verb. 2017-07-14 11:23:41 -07:00
Belsima
9167c121be Adds a corgi, bird, and more sprites to the pAI. (#3592)
* Adds a corgi sprite to the pAI.

* adds more pAI sprites

* commas are hell
2017-07-13 23:42:55 -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
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
LorenLuke
8ee79ec299 Reduced chance to miss base from 40% to 25%. 2017-07-09 16:19:32 -07: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
bbfb6f01fe Merge pull request #3555 from Woodratt/WR_6302017_Mapstuff
Woodrat breaks map stuff
2017-07-06 17:43:09 -05:00
Anewbe
90586ec2ac Merge pull request #3556 from Nalarac/Defib
Readds Jumper Cable Kits
2017-07-04 17:02: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
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
Andrew
3a089ab8a6 Merge branch 'master' into master 2017-06-25 18:10:33 -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
5d9a91df63 Merge pull request #3510 from FTangSteve/engieBorg
Ports inflatable dispensers from Bay
2017-06-20 00:56:23 -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
Anewbe
99320866b0 Merge pull request #3530 from VOREStation/qdel-hints-gen-4
Qdel Hints Round IV
2017-06-16 16:21:58 -05: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
Anewbe
5d81148ab8 Merge pull request #3511 from VOREStation/garbage-subsystem
tg Garbage Subsystem
2017-06-10 17:20:22 -05:00
Anewbe
1ace6311a8 Merge pull request #3520 from VOREStation/aro-pol-gmob
Greases up get_blahblah_fast
2017-06-10 15:56:28 -05:00
Arokha Sieyes
6d58df9f60 Surgery and syringe fixes
Fixes a line printed about staying close to your patient printed in error, and makes syringes work on laying patients again.

The do_surgery overrides are from a bygone era.

Tested == yes
2017-06-09 02:11:23 -04:00
Arokha Sieyes
7de82a599d Greases up get_blahblah_fast
Untypes lists, obj is more likely so it goes first, uses get_turf now that get_turf uses the get_step witchcraft method.
2017-06-09 00:42:16 -04:00
FTangSteve
30f8a269c1 Adds an inflatable dispenser to engie borgs. Also gives them a small pool of plasteel. 2017-06-06 19:23:22 -04:00
Leshana
e48b548f2b More and more Destroy() cleanups all across the board - Return qdel hints. 2017-06-05 23:01:41 -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
Anewbe
ef7b19926a Fixes an examine runtime 2017-06-05 15:08:28 -05:00
Anewbe
35230b4e7c Merge pull request #3497 from Ardebitis/master
Adds "treadwell" engiborg sprite.
2017-06-04 16:34:32 -05:00
Anewbe
b9007d11a8 Merge pull request #3493 from VOREStation/just-stonedmc
Port of StonedMC master controller framework
2017-06-04 16:15:13 -05:00
Anewbe
e2860b30b3 Fixes a runtime 2017-06-03 19:42:17 -05:00
Anewbe
24b35ace2f Merge pull request #3488 from LorenLuke/Changeling-camo
Changeling Visible Camouflage Tweaks
2017-06-03 16:11:14 -05:00
Anewbe
650cf3f0e9 Merge pull request #3492 from VOREStation/fix-null-rank
Prevent returning null from get_authentification_rank()
2017-06-03 16:01:22 -05:00
BuildTools
4e6a5ab55b Adds "treadwell" engiborg sprite. 2017-06-03 01:15:27 -04:00
Leshana
b17fb86721 Tweaks Statpanel and System Initialization 2017-06-01 21:42:08 -04:00
Leshana
8b3403d54f Prevent returning null from get_authentification_rank()
Make sure we return the no job value if they have an id without a rank that is in a PDA.
Should fix https://github.com/PolarisSS13/Polaris/issues/3486
2017-06-01 15:52:38 -04:00
LorenLuke
2bdfe8bfa3 Prevents people from seeing names/examining cloaked changelings at range 2017-05-31 18:44:43 -07: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
Neerti
1f70e65160 Merge pull request #3484 from VOREStation/aro-pol-footblood
Please let the blood go away
2017-05-31 10:49:11 -04:00
Arokha Sieyes
64ff8bed08 Please let the blood go away
You can't qdel lists.
2017-05-30 16:27:04 -04:00
Anewbe
a412b5063b Merge pull request #3423 from Belsima/ftm
Lets biological females have facial hair.
2017-05-29 18:31:18 -05:00