Commit Graph

25913 Commits

Author SHA1 Message Date
Anewbe
968dfe666c Changes how darkvision works 2017-07-28 21:11:05 -05:00
LorenLuke
31e90bfeed Adds Collapsible AM rifle. Createes new uplink entry (#3644)
* Adds Collapsible AM rifle, and adds case with parts and 5 shots to Uplink. Separates it and intended merc version, both costing default telecrystal amount. Does NOT make them antagonist type specific.

* Addresses review.

* Makes rifle case traitor/merc specific. Enables ability to have specific uplink items be available only for specific antags.
2017-07-28 16:06:20 -05:00
MagmaRam
ff557493bd Merge pull request #3631 from Anewbe/merc_heist_again
Readjusts merc and heist numbers
2017-07-28 15:24:06 -05:00
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
96be075cbe Merge pull request #3648 from Anewbe/technomancer
Adds more technomancer icons
2017-07-28 15:20:05 -05:00
MagmaRam
ded94ef66c Merge pull request #3643 from Anewbe/monkey_cubes
Adds monkey cubes to the traitor uplink
2017-07-28 15:18:30 -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
c51b33fef2 Adds more technomancer icons 2017-07-26 17:07:19 -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
Anewbe
c3945440c6 Adds monkey cubes to the traitor uplink 2017-07-25 17:55:02 -05:00
MagmaRam
c14e33383a Merge pull request #3637 from Anewbe/ling_armor_runtime
Should fix a qdel warning runtime for ling armor
2017-07-25 17:04:39 -05:00
MagmaRam
86d5262c60 Merge pull request #3625 from Anewbe/mend_synthetic
Mend Synthetic actually repairs FBPs
2017-07-25 17:03:54 -05:00
MagmaRam
3f8c3bfeba Merge pull request #3640 from Anewbe/eal_comms
Comms can speak EAL
2017-07-25 17:02:04 -05:00
Anewbe
31bc1f757f Merge pull request #3635 from LorenLuke/Bomb-Consistency
Tank/TTV Consistency improvement
2017-07-25 16:44:45 -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
Neerti
8dab8c1440 Merge pull request #3642 from SpadesNeil/thunderdome-camera
Makes Thunderdome camera indestructable.
2017-07-25 05:51:09 -04:00
Spades
07e907b1cc Makes Thunderdome camera indestructable.
Uses this code:
```
/obj/machinery/camera/ex_act(severity)
if(src.invuln)
return
```
2017-07-25 01:57:46 -04: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
aa18b610af Should fix a qdel warning runtime for ling armor 2017-07-24 13:51:58 -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
686250d695 Merge pull request #3623 from Nalarac/Robot
Allows Click Dragging for Cryo and Cloner
2017-07-24 12:37:44 -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
LorenLuke
3a80ffa080 Fixes inconsistent behavior by TTVs and STBs. 2017-07-24 10:28:20 -07: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
Anewbe
461ea17531 Readjusts merc and heist numbers 2017-07-23 17:31:28 -05:00
Neerti
65e9e9459a Merge pull request #3619 from Anewbe/antag_weapon_swaps
Adds the weapon swaps to the uplink
2017-07-23 17:44:15 -04: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
a5114f99dd Embiggens the laundry baskets 2017-07-23 16:33:02 -05:00
Anewbe
01e6161d87 New limbs can no longer be attached over limb stumps 2017-07-23 15:22:37 -05:00