Commit Graph

6887 Commits

Author SHA1 Message Date
Arokha Sieyes
c15c4da829 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync 2016-06-14 16:48:00 -04:00
Yoshax
2adf53d265 Merge pull request #1939 from VOREStation/emotestop
Prevent lobby players from seeing emotes
2016-06-14 21:46:36 +01:00
Arokha Sieyes
cecd4c7a61 Prevent lobby players from seeing emotes
Someone had already added a 'return-only' override for hear_say for new_player mobs to keep their ghostears from working in the lobby, however ghostsight/eyes/whateveritscalled has not worked as it should and it seems like nobody thought to add a show_message block for emotes.
2016-06-14 16:08:53 -04:00
Arokha Sieyes
0350a266d1 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync
# Conflicts:
#	code/modules/client/preferences.dm
2016-06-14 12:01:42 -04:00
Arokha Sieyes
878cf928f8 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync
# Conflicts:
#	.travis.yml
#	vorestation.dme
2016-06-13 13:12:40 -04:00
Arokha Sieyes
b624e7703a Adds actual video calls to communicators
'chu heard me. S'what it does. When you're on a call, there's a "Start Video" button next to each person. When you click it, you actually look through their thing, like a ghost might if they ghostcalled. You have to stay within 1 tile of a video showing communicator to see it.

Multiple people can share one communicator video stream by setting it on a table or whatever, and examining it. There's a message like "It appears to be showing a video: [view]" and you can click view and you can all look at the video. COLLABORATION. SYNERGY. OTHER BUZZWORDS.

I also added the feature of DECLINING requests from people.

Also communicators show up on a special camera list on security consoles, but the same EPv2 network visibility turns this off as well if you wanna be all hidey. This does mean that people with the visiblity on serve as sort of roaming AI cameras for the AI as well. So the AI can watch you repair the outside of the station or whatever if you want.
2016-06-13 02:55:05 -04:00
Arokha Sieyes
7b4d571889 Makes communicators great again 2016-06-11 22:05:01 -04:00
Arokha Sieyes
40d0d75804 Rewrites LOOC and emote to use new proc
And to be more simple and sane
2016-06-11 21:53:56 -04:00
Arokha Sieyes
1e9e55d73d Moves static overlay to be a global HUD option 2016-06-11 21:53:30 -04:00
Datraen
78e63a00a4 Xenobio2 Update #7 (#1910)
* Ensures cores, slimes cannot be used twice in their machines.

* Fixes xenos appearing friendly, simple_mob death problems.

Simple mobs that were dead and not of the hostile subtype wouldn't call walk(src,0), which prevents corpses from following their target.

* Cleans up trait data when a xeno or xeno product is removed.

* Slimes more likely to have amutationtoxin, consumes virusfood.

* Fixes some issues.

* Adds changelog
2016-06-10 19:28:59 +01:00
Arokha Sieyes
b16d73d1da Merge pull request #341 from Cameron653/master
Bugfixes and promethean nerf.
2016-06-09 20:12:13 -04:00
Cameron653
0344114872 Makes weight not be "they are" anymore. 2016-06-09 15:34:12 -04:00
Cameron653
49ebf37c72 Final fix 2016-06-09 02:48:54 -04:00
Cameron653
8172737fc9 Byond and travis hate .1 2016-06-09 02:44:23 -04:00
Cameron653
91a77e5bb9 Severely nerfs prometheans heal rate 2016-06-09 01:51:45 -04:00
Cameron653
f9ac5f3bfa Fiiixesss 2016-06-09 01:31:49 -04:00
Cameron653
816255fed4 Allows prometheans to actually change into all species 2016-06-09 01:27:13 -04:00
Spades
4b9eeec946 Merge pull request #320 from VOREStation/synthgurgles
Tweaks digestion code
2016-06-08 13:36:15 -04:00
Arokha Sieyes
eb6f979fc0 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync
# Conflicts:
#	vorestation.dme
2016-06-07 18:37:47 -04:00
Arokha Sieyes
c625a7515e Tweaks digestion code
Makes synths digest more gracefully and actually preserves MMIs like intended
2016-06-07 18:20:52 -04:00
Cameron653
c5d3883ef5 Create prometheans_vr.dm 2016-06-07 15:08:17 -04:00
Datraen
fa74226e99 Merge pull request #1844 from SpadesNeil/GunsGunsGuns
Guns, Guns, Guns (Now in a PR less stupid)
2016-06-05 13:25:26 -04:00
Arokha Sieyes
3f47fe64b6 Merge pull request #291 from VOREStation/dev-Ace
Replaces several mobs with vore versions
2016-06-03 23:57:39 -04:00
Spades
bd2dcfe956 Compile error fix. 2016-06-03 23:27:10 -04:00
Spades
aa2c74aef5 Replaced mobs with vore versions. 2016-06-03 22:57:51 -04:00
Arokha Sieyes
15fdb5eb1b Synth gets hit by axe? Internal bleeding.
That'sa-no-good.
2016-06-03 21:18:24 -04:00
Arokha Sieyes
307e261e72 Synth gets hit by axe? Internal bleeding.
That'sa-no-good.
2016-06-03 21:14:46 -04:00
Spades
736c8c132c Merge remote-tracking branch 'refs/remotes/PolarisSS13/master' into GunsGunsGuns 2016-06-02 13:01:45 -04:00
Yoshax
f75d509e7f Ports event system from Bay 2016-06-01 22:05:04 +01:00
Spades
a54e49fa73 Merge remote-tracking branch 'refs/remotes/PolarisSS13/master' into GunsGunsGuns 2016-06-01 15:16:53 -04:00
Yoshax
0fb98bbabd Scheduler now uses btime, and other improvements 2016-06-01 17:56:07 +01:00
Spades
ff87150c3d Let's just have the one commit this time because I'm no longer paranoid of losing progress. 2016-06-01 12:48:48 -04:00
Neerti
3e3962c0a9 Merge pull request #1801 from Anewbe/more_hostile_mobs
PUNCH SPIDERS, GET MONEY
2016-06-01 00:37:46 -04:00
Arokha Sieyes
925b1b4a3e Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync
# Conflicts:
#	code/game/mecha/mech_fabricator.dm
2016-05-31 18:17:58 -04:00
Mechoid
7bcd041e09 Fixes overlay issue with ghosts when choosing sprites, and adds more sprites to choose from from popular demand. 2016-05-31 14:30:17 -07:00
Datraen
36d9cee0f7 Merge pull request #1806 from VOREStation/limbprinter
Make FBPs Constructable
2016-05-31 15:50:32 -04:00
Arokha Sieyes
54272da167 Merge pull request #245 from VOREStation/sink
Synchronize With Polaris
2016-05-31 01:35:04 -04:00
Leshana
eae29b9d69 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sink 2016-05-30 22:43:05 -04:00
EmperorJon
741706e9e3 Underwear + setup merges (#1812)
* Manually merges 12595 and 12461.

* Moron Jon 2: Moron Boogaloo

* Makes Yosh happier
2016-05-30 19:19:45 +01:00
Arokha Sieyes
6283dcdc86 Merge pull request #204 from Poojawa/vulparace
Vulparace
2016-05-30 02:43:08 -04:00
Arokha Sieyes
2186afb094 Dem tags doe.
Closed a </span> tag I forgot.
2016-05-30 02:22:33 -04:00
Arokha Sieyes
05f8a69821 Make FBPs Constructable
Print 'em out, slap an MMI or Posibrain in. They come from a new machine, the Prosthetics Fabricator. You can order license discs from cargo to print the proprietary limbs. Making FBPs requires a bit of research as well, otherwise you only get arms/legs. Also requires a bit of plasteel to make the critical parts. Mostly just need every limb, plus eyes. Torso comes with the snowflakey FBP battery.

Also adds an FBP 'self-diagnostics' verb. More vague than an analyzer.

**This adds a machine that needs to be placed on the map. "/obj/machinery/pros_fabricator"**

Personally, I would replace the right-side exosuit fab with it. I can add this to my PR but I'm unsure how you guys feel about non-devs submitting map changes.
2016-05-30 02:13:55 -04:00
Anewbe
5f02cb745d Fixes indentation error 2016-05-29 16:54:17 -05:00
Leshana
ff9b8a2a84 Make OOC_Notes easily and conveniently viewable when examining players. 2016-05-29 17:34:40 -04:00
Anewbe
8d470f6989 Adds cult variants of the strong mobs 2016-05-29 16:07:19 -05:00
Anewbe
9b7c17a883 Adds stronger variants of cultmobs for shenanigans. 2016-05-29 15:57:31 -05:00
Leshana
e004a8bfc0 Merge remote-tracking branch 'polaris/master' into sink
# Conflicts:
#	code/_onclick/item_attack.dm
#	code/modules/client/preferences.dm
#	code/modules/mob/living/carbon/human/examine.dm
#	code/modules/mob/living/simple_animal/hostile/hostile.dm
#	code/modules/mob/new_player/preferences_setup.dm
#	nano/images/nanomap_z1.png
#	vorestation.dme
2016-05-29 16:22:07 -04:00
Poojawa
423a010eba grammar tweak 2016-05-29 14:18:05 -05:00
Poojawa
e6368fb900 sync 2016-05-29 13:04:06 -05:00
EmperorJon
5a545854a4 Underwear Datums (#1794)
* One more step to bringing our preferences/setup stuff in line with Bay.

* Whoopsy

* Jon is a moron, more at 11.
2016-05-29 17:29:36 +01:00