Commit Graph

16177 Commits

Author SHA1 Message Date
MagmaRam
2ca3c4f38c Merge pull request #3603 from Anewbe/drug_tweaks
Caps the negative effects of the high-end drugs
2017-07-28 15:23:59 -05:00
MagmaRam
ab51b83662 Merge pull request #3657 from Anewbe/admin_intercom
Hackfixes the admin intercomm verb
2017-07-28 15:18:12 -05:00
MagmaRam
f59cfae29a Merge pull request #3646 from Anewbe/hyperzine_tweaks
Hyperzine is no longer toxic
2017-07-28 15:18:03 -05:00
MagmaRam
ccb070b319 Merge pull request #3645 from Anewbe/more_feeus
More Morpheus ship names
2017-07-28 15:17:42 -05:00
MagmaRam
91928e4cf8 Merge pull request #3658 from Cyantime/flatcap
Fixes the colorable flatcap in loadout having no icon
2017-07-28 15:17:19 -05:00
Cyantime
bf60030b6b Fixes loadout flat cap having no icon 2017-07-27 23:25:28 -04:00
Cameron653
97957fcaee Replaces more macros. (#3647)
* MORE MACRO CHANGES

AHHHHHHHHHHHHHHHHHHHH

* Fixes a few typos

* Fixes compile error

* Fixes for real

* 4 macros left that I can't find
2017-07-27 21:12:21 -05:00
Anewbe
48935dcde2 Hackfixes the admin intercomm verb 2017-07-27 18:52:34 -05:00
Anewbe
6fda2e8c59 Prevents attachment of limbs over limb stumps while still allowing FBP construction 2017-07-27 17:40:32 -05:00
Anewbe
3301e20ce8 Revert "New limbs can no longer be attached over limb stumps" 2017-07-27 16:58:02 -05:00
Cyantime
3cd1374e17 Fix mouse behaviour 2017-07-27 02:10:24 -04:00
Anewbe
41e199cb92 The drink Balloon can now be made 2017-07-26 18:57:29 -05:00
MagmaRam
77b4382c10 Merge pull request #3414 from Anewbe/robolimb_things
Starts support for species robolimbs
2017-07-26 18:34:48 -05:00
MagmaRam
053f4b8377 Merge pull request #3650 from Anewbe/treefix
Diona no longer gain nutrition from food
2017-07-26 18:29:18 -05:00
MagmaRam
a50d850461 Merge pull request #3628 from Anewbe/limp_stump
New limbs can no longer be attached over limb stumps
2017-07-26 18:28:59 -05:00
Anewbe
5ae30058c0 Diona no longer gain nutrition from food 2017-07-26 17:48:33 -05:00
Anewbe
a2bea11d14 Hyperzine is no longer toxic 2017-07-26 13:45:13 -05:00
Neerti
8c99637054 Merge pull request #3627 from Anewbe/egun_stun
Fixes an oversight with eguns
2017-07-26 04:21:04 -04:00
Anewbe
5b51ca49cf More Morpheus ship names 2017-07-25 19:21:27 -05:00
MagmaRam
3f8c3bfeba Merge pull request #3640 from Anewbe/eal_comms
Comms can speak EAL
2017-07-25 17:02:04 -05:00
SilveryFerret
c8fc6f25e5 Oxyphoron change proposal (#3634)
* Changes oxyphoron to hydrophoron

* Stops hydrophoron magically producing oxygen

Instead, it creates a spark when it's tossed on the ground., and shoves
phoron into the air. Hooray!

* Change hydrophoron touch_turf proc at Anewbe's request

* Missed a /2
2017-07-25 16:44:30 -05:00
Anewbe
9b3d420c2b Merge pull request #3641 from PrismaticGynoid/voiceshearsilicons
Communicator voices can understand speech with no default language.
2017-07-25 16:38:09 -05:00
Anewbe
6525e2cf73 Comms can speak EAL 2017-07-24 20:45:41 -05:00
Anewbe
b6d6cb1f15 Merge pull request #3624 from Cyantime/holopads
Changes AI holopad speech/emotes to use get_mobs_and_objs_in_view_fast()
2017-07-24 20:17:54 -05:00
Anewbe
27112ecd6a Merge pull request #3630 from Neerti/7/23/2017_medibot
Ports TG Medibot Sounds + More
2017-07-24 17:03:00 -05:00
Anewbe
b22ce553cc Merge pull request #3632 from Neerti/7/23/2017_rip_trine
Fixes Autoantag Assigning to Invalid Mobs
2017-07-24 12:39:58 -05:00
Anewbe
824cab5270 Merge pull request #3621 from Cameron653/master
Makes sure female executive suit has different name
2017-07-24 12:37:29 -05:00
Neerti
3268ebe769 Fixes Autoantag Assigning to Invalid Mobs
Uses a mob var to determine antag validity instead of typechecks, since I believe this will work out better in the long term.  Inheritance can automatically make new mobs we make be invalid by default.
2017-07-23 20:19:24 -04:00
Anewbe
71ea1b2b3a Adjusts egun stun amount 2017-07-23 17:36:58 -05:00
Neerti
139d397a47 Merge pull request #3578 from Anewbe/surgical_caps
Adds surgical caps to the loadout
2017-07-23 17:42:51 -04:00
Neerti
30005af123 Ports TG Medibot Sounds + More
Medibots now have audio sounds files to play when they talk, which I find to be both practical and makes the bots somewhat creepy and/or endearing.
Adjusts some code so that all the new sound files can play when applicable.
Adjusts small pieces of code to make slightly prettier.
Re-Adds the Mysterious Medibot, International Medibot of mystery.  Admin-spawn only.
Emagged medibots will do the beepsky rant 25% of the time.
Bonus: Adds integrated circuit that can play all the new medibot voices.
2017-07-23 17:36:45 -04:00
Anewbe
01e6161d87 New limbs can no longer be attached over limb stumps 2017-07-23 15:22:37 -05:00
Cyantime
2626a95c74 Replaces hearer()/viewers() checks with get_mobs_and_objs_in_view_fast() in AI holopad transmission 2017-07-23 14:03:55 -04:00
MagmaRam
9055ac6e1e Merge pull request #3600 from Anewbe/scrubs
Gives medical scrubs sleeves, that can be rolled down.
2017-07-23 11:34:21 -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
Cameron653
5356b54b60 Update miscellaneous.dm 2017-07-22 21:49:23 -04:00
silveryferret
d9526bde2c Puts initial_fire_delay and burst_delay into variables instead of hardcoded numbers, as requested. 2017-07-22 17:24:08 -04:00
Anewbe
ab5e716624 Merge pull request #3617 from SpadesNeil/centcom-not-centcomm
CentCom not centcomm
2017-07-22 13:30:06 -05: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
Anewbe
45b789ebbf Merge pull request #3613 from SpadesNeil/5.56-to-5.45-take-two
Changes 5.56mm to 5.45mm, now 20% less stupid
2017-07-20 15:33:38 -05:00
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
PrismaticGynoid
34f9e11d76 Voice mobs in communicators can now understand speech they hear from mobs that have no default language set - in other words, all silicon mobs - as well as speech not attached to a mob, such as from the Arrivals Announcement Computer. 2017-07-19 19:27:07 -07: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
Spades
2e776ac645 Changes 5.56mm to 5.45mm, now 20% less stupid
The same as https://github.com/PolarisSS13/Polaris/pull/3612 except this
time I'm not a dumbass and accidentally overwriting other changes
because the Github client decided not to sync with Polaris.
2017-07-19 14:24:50 -04: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