Commit Graph

15830 Commits

Author SHA1 Message Date
silveryferret
ad5cfd0087 Fixes Chemistry-Recipes.dm.
Not 100% sure how this happened, mergetool must've screwed up somehow.
2017-07-19 23:22:36 -04:00
silveryferret
3d3ff303c7 Adds missed Oxyphoron reaction, moves Deuterium/fifty into obj/fiftyspawner/deuterium 2017-07-19 23:14:15 -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
Anewbe
4f40e49e9f Merge pull request #3611 from Belsima/vests
Makes blob light green and dim.
2017-07-19 12:49:06 -05:00
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
Belsima
3047b9285c Changes blob core lighting. 2017-07-19 10:08:57 -04: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
Belsima
d33132b0ad Makes blob light green and dim. 2017-07-18 12:12:03 -04: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
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
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
LorenLuke
b7f5362276 See https://github.com/Baystation12/Baystation12/pull/14404.
(ignore point 13)
2017-07-16 16:03:31 -07: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
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
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
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
Anewbe
3648aa0348 Tweaks Hawaiian shirts and sweaters 2017-07-11 14:39:44 -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
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
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
Neerti
a47584fdb0 Merge pull request #3576 from Anewbe/medical_gowns
Adds medical gowns
2017-07-10 17:48:31 -04:00
Anewbe
da004981e6 Rolling sleeves on flannel shirts now uncovers your arms 2017-07-10 16:44:57 -05:00
LorenLuke
8ee79ec299 Reduced chance to miss base from 40% to 25%. 2017-07-09 16:19:32 -07:00
Anewbe
4f1760689d Fixes a typo 2017-07-09 17:18:36 -05:00
Anewbe
c64f7c9fa3 Merge pull request #3505 from Dhaeleena/Somecat
Winter boots
2017-07-09 17:13:27 -05:00
Anewbe
252f3af8ad Adds medical gowns 2017-07-09 15:03:11 -05: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
aa164f4a99 Merge pull request #3568 from Belsima/swimsuits
Adds a striped swimsuit.
2017-07-08 14:44:42 -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