cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-04 13:20:15 +00:00
Code Issues Packages Projects Releases Wiki Activity
31,554 Commits 9 Branches 26 Tags
cebf45e11b5cbd9fc03cd03dac8b0b5932cc53ab
Commit Graph

5777 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
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
EmperorJon
388ec9cb11 Merge pull request #1931 from VOREStation/videocalls 
Adds actual video calls to communicators
 2016-06-14 01:31:40 +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
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
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
22e2352925 Makes suit coolers work right in mecha 
2 year old typo

Fixes #1924
 2016-06-11 23:30:41 -04:00
Arokha Sieyes
7b4d571889 Makes communicators great again 2016-06-11 22:05:01 -04: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
Arokha Sieyes
08972b1dc5 Better, now. 2016-06-09 18:28:16 -04:00
Arokha Sieyes
3e5faabe0c Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sank 2016-06-09 01:00:07 -04:00
Arokha Sieyes
74a1b59a39 Adds IDs and Wallets 
Adds variants of ID cards for each department and head, and adds several new colors of wallet. The wallets self-color the little ID in the corner based on the ID inserted so they always show the right picture of the ID, without needing to sprite each ID. Some are snowflaked, notably Gold and Centcom, but the rest are generated on the fly based on colors on the ID.
 2016-06-08 19:29:47 -04:00
Spades
4b9eeec946 Merge pull request #320 from VOREStation/synthgurgles 
Tweaks digestion code
 2016-06-08 13:36:15 -04:00
Neerti
fa5dd08f2f Merge pull request #1893 from Yoshax/spears 
Spear fix + a change
 2016-06-08 01:14:05 -04:00
Yoshax
d076962c51 Spear fix + a change 2016-06-08 03:54:44 +01: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
Kearel
d21841a92e Lets spears be made from butterfly knifes as well as shards. 2016-06-07 19:42:11 +01:00
PsiOmegaDelta
457b4cc367 Large crates now insert items on initialization. 
Similar to how crates/lockers do it.
 2016-06-07 19:06:45 +01:00
GinjaNinja32
debfd3dabf Ports GinjaNinja32's drinks rewrite from Bay 2016-06-06 20:33:11 +01:00
Spades
aa2c74aef5 Replaced mobs with vore versions. 2016-06-03 22:57:51 -04:00
Broseph Stylin
97a94af41a Fixes mapped-in double beds being made of steel and lacking padding. 2016-06-03 02:36:27 -03:00
Datraen
fbb0f764d2 Adds a missing (src) 2016-06-02 18:12:21 -04:00
Datraen
be4a51eae8 Puts the qdel in initialize. 2016-06-02 14:36:53 -04:00
Datraen
804d69e965 Gives sparks a chance to qdel. 2016-06-02 14:31:20 -04:00
Neerti
a95b47174e Merge pull request #1851 from Yoshax/bugfixes 
Adjusts the checks to ensure you cannot buckle two people to the same thing
 2016-06-02 10:36:25 -04:00
Yoshax
4d3afc42b6 Adjusts the checks to ensure you cannot buckle two people to the same thing 2016-06-02 15:04:40 +01:00
Arokha Sieyes
42107cda37 Fixes CentCom IDs. 2016-06-01 23:06:10 -04:00
Yoshax
f75d509e7f Ports event system from Bay 2016-06-01 22:05:04 +01:00
Datraen
2c95126a00 Merge pull request #1765 from Yoshax/cocainecocaine 
Fixes snow and adjusts a definition
 2016-06-01 15:57:15 -04:00
Yoshax
0fac31fad3 Fixes being able to buckle more than one mob to bucklable things 2016-06-01 16:34:07 +01:00
Yoshax
d32a708ec7 Fixes snowy overlays layering 2016-06-01 16:01:36 +01:00
Arokha Sieyes
595d1f77f2 Merge pull request #261 from Arokha/sync 
Polaris Sync
 2016-05-31 21:22:43 -04:00
Yoshax
0777379d37 Fixes box of EMP grenades only ever spawning 1 grenade 2016-06-01 02:00:57 +01: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
Datraen
36d9cee0f7 Merge pull request #1806 from VOREStation/limbprinter 
Make FBPs Constructable
 2016-05-31 15:50:32 -04:00
Cameron653
b24a61a46a Small typo fix 2016-05-31 14:13:13 -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
Cameron653
d4c16be569 Adds in a language implant. 2016-05-30 16:59:57 -04:00
Spades
26c759c7ad Fixes #1813 (#1815) 2016-05-30 19:57:06 +01: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
Broseph Stylin
333603ce51 Adds working double beds. (#1807) 
* Adds double beds.

* Adds double bedsheets + Ian single bedsheet.

* Adds double bedsheet sprites.

* Adds double bed sprites.

* Fixes a stupid item_state mistake.
 2016-05-30 19:03:56 +01: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
Spades
c96e66a144 Minor tweaks, Skipjack can now dock at station 
Tried editing communicator.dm and shuttle_controller.dm as their own _vr
files but this might cause problems, I'm not sure.
 2016-05-29 18:04:46 -04: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
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