Commit Graph

14510 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
Anewbe
c182da0fe1 Adds fine smokables to the loadout 2016-06-10 22:04:07 -05:00
Anewbe
01224f0e89 Allows anyone who can loadout a large webbing select any large webbing 2016-06-10 21:09:21 -05:00
Arokha Sieyes
bb42f4e51d Fixes bellies overwritng each other
Now you can have more than one slot. Fair warning, if you load another character then save bellies, it overwrites those. Like if you do that AFTER spawning. Like you're playing a mob from slot 1, you go into preferences > character set up, load slot 2, then open vore panel and click save, it will overwrite slot 2.

On the one hand, an easy way to copy bellies between characters! On the other, perhaps unexpected.

This prooooooooooobably doesn't delete everyone's bellies? Probably. Maybe you should copy the data folder, just in case. ;o Skip the logs.
2016-06-10 21:02:01 -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
Yoshax
e6f097cc69 Merge pull request #1908 from VOREStation/shaddup
"1" Spam
2016-06-10 15:57:54 +01:00
Arokha Sieyes
2000f95886 "1" Spam
Why would you do this to meeee.
2016-06-10 09:50:54 -04:00
Datraen
f3689d0e05 Merge pull request #1904 from VOREStation/wallets
IDs and Wallets
2016-06-10 01:52:47 -04:00
Cameron653
eba3e1bf27 Moth wings, non colorable. 2016-06-10 01:04:11 -04:00
Cameron653
91e247a75a Adds in a colorable moth wings.
Sprited by Tk20634
2016-06-10 01:02:51 -04:00
Spades
5694f545e0 Merge pull request #338 from VOREStation/Guns-Guns-Guns
Fluff rifle casing icon fix
2016-06-10 00:35:34 -04:00
Arokha Sieyes
309761f051 Mech tracking beacon
Was unbuildable for some reason. How'd it lose the ID? And why was it all by itself in some random path and category.
2016-06-10 00:27:49 -04:00
Arokha Sieyes
b16d73d1da Merge pull request #341 from Cameron653/master
Bugfixes and promethean nerf.
2016-06-09 20:12:13 -04:00
Arokha Sieyes
08972b1dc5 Better, now. 2016-06-09 18:28:16 -04:00
Cameron653
0344114872 Makes weight not be "they are" anymore. 2016-06-09 15:34:12 -04:00
Yoshax
730fceb2d7 Makes Datraen happy 2016-06-09 17:23:43 +01:00
Yoshax
52f8c6a344 Ensures retail scanners work with drinks 2016-06-09 17:08:07 +01:00
Yoshax
b1e78b86e8 Merge pull request #1903 from Datraen/Xenobio2Update6
Xenobio2 Update #6
2016-06-09 15:46:30 +01:00
Datraen
8e40ad6f49 Fixes #1899, changes name references to [src]. 2016-06-09 09:05:33 -04:00