Commit Graph

34292 Commits

Author SHA1 Message Date
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
14fb294e79 Merge pull request #3610 from Atermonera/Observer_icons
Adds various animal sprites to ghost icons
2017-07-18 20:20:02 -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
Atermonera
f334fbe3a2 Fucking commas 2017-07-17 17:02:02 -07:00
Atermonera
83b8f5be01 Changelog 2017-07-17 16:42:44 -07:00
Atermonera
cd8b89d249 Adds various animal sprites to available ghost sprites 2017-07-17 16:40:54 -07: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
cfb233aa1b Fixes travis. 2017-07-16 12:19:35 -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
Neerti
2780d3745d Merge pull request #3601 from Anewbe/hop_console
Adds cargo jobs to the ID console
2017-07-14 23:38:54 -04: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
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
Anewbe
03be56e10e Merge pull request #3580 from Belsima/candles
Replaces candlesprites.
2017-07-12 23:23:12 -05:00
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
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
088fdf46a5 Merge pull request #3596 from Woodratt/WR_Airlockfix
Fixes for external airlocks
2017-07-12 16:10:53 -05:00
Anewbe
b667754ddf Merge pull request #3591 from Belsima/screens
Adds directional icons for telescreens.
2017-07-12 16:10:13 -05:00
Woodratt
07e9341035 Fixes for external airlocks
Construction sprites added for external airlocks, glass and normal.
2017-07-11 19:16:20 -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
Neerti
ffd1f03e88 Merge pull request #3594 from Anewbe/accessories
Tweaks Hawaiian shirts and sweaters
2017-07-11 15:57:30 -04:00
Anewbe
3648aa0348 Tweaks Hawaiian shirts and sweaters 2017-07-11 14:39:44 -05:00
Anewbe
e8b96b12f5 Merge pull request #3586 from Belsima/galoshes
Fixes up the galoshes.
2017-07-11 11:24:35 -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
Anewbe
862c771199 Merge pull request #3590 from Cameron653/SMOKING_TESH
Fixes teshari smoking sprites
2017-07-11 11:22:15 -05:00
Belsima
ea07eaf926 Adds directional icons for telescreens. 2017-07-11 11:50:44 -04:00
killer653
2f7db6caf3 Makes cigars and cigs show up on tesh 2017-07-11 03:04:41 -04:00
Belsima
b3ca1ca844 nevermind, we removed species restrictions 2017-07-11 00:56:17 -04:00
Belsima
5ef4fd26ca snip snip
Cuts off the fingers of the fingerless gloves. Oops.
2017-07-11 00:54:16 -04:00
Belsima
e51de25dea Adds fingerless gloves. 2017-07-11 00:49:02 -04:00
Belsima
1f36db7cb0 Merge 2017-07-10 18:44:05 -04:00
Belsima
47a6c8e28c Adjusts galoshes sprites. 2017-07-10 18:43:35 -04: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