Commit Graph

16690 Commits

Author SHA1 Message Date
Spades
f6871d2656 Almost forgot the AP rounds! 2016-06-14 17:41:47 -04:00
Spades
0433d9bf83 Derp. 2016-06-14 17:17:33 -04:00
Spades
1f48a98ba4 Official Vorestation SMG. *nodnod* 2016-06-14 17:16:29 -04:00
Spades
51be44fef0 PDW added 2016-06-14 17:11:57 -04:00
Arokha Sieyes
c15c4da829 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync 2016-06-14 16:48:00 -04:00
Yoshax
0d6381b3fc Merge pull request #1940 from SpadesNeil/deagle-fix
Fixes #1918, and Desert Eagle empty icons added.
2016-06-14 21:46:50 +01:00
Yoshax
2adf53d265 Merge pull request #1939 from VOREStation/emotestop
Prevent lobby players from seeing emotes
2016-06-14 21:46:36 +01:00
Spades
c89752a369 Fax, Prayer, and Emergency Comms
Resolves #1862
2016-06-14 16:32:13 -04:00
Spades
e650531dba Desert Eagle empty icons added. 2016-06-14 16:17:25 -04: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
cb65295059 Fixes issues with update:
Replaces glass boxes on map with new path
Removes duplicate code accepted into Polaris
Moves supplypacks_vr to science_vr
2016-06-14 15:01:37 -04:00
Cameron653
7434b47902 Merge remote-tracking branch 'refs/remotes/VOREStation/master' 2016-06-14 14:13:43 -04:00
Cameron653
b162aefe92 Ahhhhhh 2016-06-14 14:09:51 -04:00
Cameron653
9ac44d196a Makes it so only the user gets the verbs 2016-06-14 14:05:48 -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
Datraen
f099af2f77 Merge pull request #1928 from Leshana/pref-datums-copyto
Move preferences copy_to() new player mobs into the preference_setup datums.
2016-06-14 11:11:07 -04:00
Arokha Sieyes
47b97546b8 Dorms protect vs radiation for lewds 2016-06-14 00:40:11 -04:00
EmperorJon
388ec9cb11 Merge pull request #1931 from VOREStation/videocalls
Adds actual video calls to communicators
2016-06-14 01:31:40 +01:00
Yoshax
3e0745677f Fixes chocolate milk and milk 2016-06-13 20:20:07 +01: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
Yoshax
f8250e08ba Merge pull request #1929 from VOREStation/fbpdrop
Fixes #1905
2016-06-13 16:15:21 +01: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
Cameron653
565c02917a So you can revive whenever wanted instead of immediately 2016-06-13 00:38:05 -04:00
Cameron653
263b1334c7 yousawnothing 2016-06-13 00:11:39 -04:00
Cameron653
3c501adec6 Adds stasis so you don't bleed out while regening 2016-06-13 00:08:28 -04:00
Cameron653
429a955a29 Adds in cobra hood (#219)
Fixes #219
2016-06-12 22:23:14 -04:00
Cameron653
bd7670567c More fixes 2016-06-12 18:57:01 -04:00
Cameron653
343827bf59 More fixes!
Also goes and sets Scree's tail as default. Can be  disabled by going to
the  vore tab and choosing "hide species specific tail sprite"
2016-06-12 18:48:30 -04:00
Leshana
11107cb851 Removing redundant sanitizing; prefs has already been sanitized by this point. 2016-06-12 13:28:24 -04:00
Datraen
36fd6fb4d6 Merge pull request #1926 from VOREStation/emotes
Rewrites Emotes + LOOC and makes Communicators work
2016-06-12 12:46:02 -04:00
Cameron653
dd35ba566d Removes whitelisted from all the races
So actual special races can be whitelisted
2016-06-12 03:32:23 -04:00
Cameron653
026c1887ad Renames and fixes 2016-06-12 03:01:13 -04:00
Cameron653
7e7eaf6ca9 one word
and you've destroyed the world
2016-06-12 02:50:28 -04:00
Arokha Sieyes
e993dffb17 Fixes #1905
*screams forever*

This one almost got me. Organs were defined in two places, probably because of a merge error, and /obj/item/organ/external/head/removed() was defined in THREE places. Pls. Why you do this. PLSSSS.
2016-06-12 02:18:00 -04:00
Cameron653
3e819c2345 no brain damage if you didn't actually die 2016-06-11 23:54:37 -04:00
Leshana
fd265861bc Move preferences copy_to() new player mobs into the preference_setup datums.
* The /datum/category_item/player_setup_item datums did a good job of organizing the code for loading/saving/editing preferences data, but all of the code that applies preferences to newly created player mobs was still in a single function.
* This change adds a new proc to player_setup_item datums:  copy_to_mob()  which is called from the traditional copy_to() proc, allowing each preferences datum to apply its own character data to the mob.
* This allowes new preferences to easily compartmentalize their new code.
* I also moved all the code for existing preferences from copy_to()  into the copy_to_mob() on their respective preferences datums.
2016-06-11 23:33:48 -04:00
Cameron653
128793c420 forgot to remove testing time. 2016-06-11 23:00:34 -04:00
Cameron653
2e3d93ab5c Actually fixes things for real 2016-06-11 22:59:15 -04:00
Cameron653
492d33100d Fiiixessss 2016-06-11 22:21:04 -04:00
Arokha Sieyes
7b4d571889 Makes communicators great again 2016-06-11 22:05:01 -04:00
Arokha Sieyes
2889540875 Fixes a random typo in limb_reattach 2016-06-11 21:54:08 -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
Cameron653
ae84ec0d02 Fixes everything in the existance of github
not really
2016-06-11 20:15:25 -04:00
Yoshax
73bccabfbb Makes everything produced in Robotics 25% cheaper to produce 2016-06-11 16:28:32 +01:00
Yoshax
137b8adb6d Removes activation sounds from glasses that have them 2016-06-11 15:25:12 +01:00
Yoshax
398709309d Merge pull request #1916 from Anewbe/vest_freedom
Allows anyone who can loadout a large webbing select any large webbing
2016-06-11 13:46:33 +01:00
Yoshax
20f93d7a1b Merge pull request #1917 from Anewbe/loadout_smokes
Adds fine smokables to the loadout
2016-06-11 13:46:09 +01:00
Cameron653
a30f688bc3 Merge remote-tracking branch 'refs/remotes/VOREStation/master' 2016-06-11 03:25:33 -04:00
Cameron653
cbaa18413f Another fix 2016-06-11 03:05:44 -04:00