Commit Graph

23496 Commits

Author SHA1 Message Date
Arokha Sieyes
cebf45e11b Hacky fix for HUD problems
Teshari hud darkness overlay keeps getting deleted globally, and worse it keeps them from spawning after. This is a cheap fix to correct this, but I have no idea what's causing it in the first place.
2016-06-16 01:34:40 -04:00
Arokha Sieyes
07081327fa Merge pull request #362 from VOREStation/sync
Polaris Sync
2016-06-14 21:19:40 -04:00
Arokha Sieyes
3809e30a07 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync
# Conflicts:
#	code/datums/supplypacks/science.dm
2016-06-14 21:09:38 -04:00
Datraen
28872c5008 Merge pull request #1923 from Yoshax/supplygroups
Adjusts cargo categories
2016-06-14 21:07:37 -04:00
Arokha Sieyes
5d6eff7e57 Merge pull request #358 from VOREStation/sync
Polaris Sync
2016-06-14 19:29:43 -04:00
Arokha Sieyes
e591cadd7b Merge pull request #360 from VOREStation/gun-fetish
PDW added
2016-06-14 19:26:54 -04:00
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
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
698a0e753d Disallows global OOC while voting 2016-06-14 15:37:01 -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
Yoshax
6eb523a998 Merge pull request #1936 from Mark9013100/6/14/2016ear_cards
Allows cards to go on the ear slot
2016-06-14 17:59:45 +01:00
Mark9013100
c0414d2917 Allows cards to go on the ear slot 2016-06-14 12:17:35 -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
9e79e35964 Makes science group not security 2016-06-13 22:55:30 +01:00
Yoshax
fff26d1289 Fixes GRC to make it not shit 2016-06-13 20:20:17 +01:00
Yoshax
3e0745677f Fixes chocolate milk and milk 2016-06-13 20:20:07 +01:00
Yoshax
fdc8b33b2c Adds towels to fitness vendor, color is randomised 2016-06-13 20:19:52 +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
Arokha Sieyes
f51b725c23 Fixes #1837
They obviously have little windows on them. And this is how they used to be. Was probably an oversight when they were converted to another format or something. Airlocks without windows are preeeetty silly.
2016-06-12 15:35:33 -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
Yoshax
1155aabb05 Merge pull request #1927 from VOREStation/exofbp
Makes suit coolers work right in mecha
2016-06-12 15:59:40 +01: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
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
Arokha Sieyes
22e2352925 Makes suit coolers work right in mecha
2 year old typo

Fixes #1924
2016-06-11 23:30:41 -04:00
Arokha Sieyes
3ad30aebc5 Removes old code comment block 2016-06-11 22:08:31 -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
Arokha Sieyes
3cb7395279 Rearranges get_mobs_and_objs_in_view_fast
Also adds the ability to select between ghost eyes and ears.
2016-06-11 21:52:52 -04:00
Yoshax
0cbade2d98 Adjusts cargo categories 2016-06-11 20:18:53 +01:00
Datraen
e18666d41a Merge pull request #1921 from Yoshax/roboticscostd
Makes everything produced in Robotics 25% cheaper to produce
2016-06-11 14:47:51 -04:00
Datraen
6984008bca Splits supplypacks.dm into categorized files, adds subtyping. 2016-06-11 12:13:40 -04:00
Yoshax
73bccabfbb Makes everything produced in Robotics 25% cheaper to produce 2016-06-11 16:28:32 +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
Datraen
299059a5be Merge pull request #1883 from Yoshax/drinks
Ports GinjaNinja32's drinks rewrite from Bay
2016-06-10 23:08:41 -04:00