Commit Graph
1263 Commits
Author SHA1 Message Date
SinTwo cba8cdcde8 Fixes #2036 2016-08-15 10:38:32 -04:00
SinTwo 045c393683 Revert "Revert "Frame Cleanup""
This reverts commit 82722ba42f.
2016-08-13 19:55:57 -04:00
EmperorJonandGitHub 8110fbbf3c Merge pull request #2232 from SinTwo/scheduler
510 scheduler
2016-08-08 10:36:36 +01:00
Eearslya 85c3e22873 Polaris sync 2016-08-06 20:34:44 -07:00
YoshaxandGitHub 82722ba42f Revert "Frame Cleanup" 2016-08-06 00:27:03 +01:00
YoshaxandGitHub afa7878abb Merge pull request #2263 from SinTwo/frame_cleanup
Frame Cleanup
2016-08-05 21:14:35 +01:00
SinTwo 07b4eb2d95 final fixes, tweaks, and cleanups 2016-08-03 14:09:12 -04:00
Anewbe 6423aa6330 Should remove flickering heat warning for FBPs and suit coolers 2016-08-01 22:06:26 -05:00
Anewbe 3795e5c52a Suit coolers now work while worn on the back 2016-07-31 00:15:42 -05:00
SinTwo b42d46205f more time proc call fixes 2016-07-30 17:39:47 -04:00
SinTwo 4f7ea573c1 world time fix 2016-07-30 03:19:47 -04:00
Yoshax 7fbb123a4d Improves/fixes surplus crate item selection 2016-07-25 23:13:12 +01:00
Yoshax f19c922984 Improves surplus crates 2016-07-25 21:45:54 +01:00
EmperorJonandGitHub 9467b103bb Merge pull request #2197 from Yoshax/uplinkreduxboogalodiscount
Reduces antag uplink discount refresh time to 10 minutes
2016-07-25 17:54:58 +01:00
Yoshax 9f2ffa9c03 Corrects an uplink item path 2016-07-25 14:39:43 +01:00
Yoshax b041a9943b Reduces antag uplink discount refresh time to 10 minutes 2016-07-25 14:04:02 +01:00
EmperorJonandGitHub 6838880374 Merge pull request #2020 from Yoshax/flashnerf
Makes flashes confuse and blind the person instead of stunning
2016-07-24 09:19:40 +01:00
SinTwo 66c3a007a9 frame cleanup fixes 2016-07-23 23:45:24 -04:00
SinTwo eb120319eb Frame code cleanup 2016-07-23 13:31:30 -04:00
SinTwo 4bff201f8b Merge branch 'master' of https://github.com/PolarisSS13/Polaris into item_state
Conflicts:
	code/game/objects/items/devices/telecrystal.dm
	icons/mob/suit.dmi
	icons/obj/clothing/suits.dmi
2016-07-22 23:39:19 -04:00
EmperorJonandGitHub a94cad7a59 Merge pull request #2168 from Yoshax/telecrystals
Multiplies all Telecrystal stuff by ten to setup for fine cost adjusting
2016-07-22 19:34:08 +01:00
Neerti ae497b0dd8 Communicator Texting for Ghosts
Ghosts can now text communicators in round, and can be texted by those back.
This is obviously logged, just in-case funny business occurs.
Adds verbs to display a log of messages that a ghost has sent and received, as well as a verb to send a message to a communicator of their choice.
2016-07-22 12:51:00 -04:00
Yoshax 21f856ed47 Multiplies all Telecrystal stuff by ten to setup for fine cost adjusting 2016-07-22 17:35:20 +01:00
SinTwo 7192bf08fd item_state cleanup 2016-07-11 22:31:32 -04:00
Arokha Sieyes 484fb96202 Merge branch 'master' of https://github.com/PolarisSS13/Polaris
# Conflicts:
#	.travis.yml
#	code/game/machinery/adv_med.dm
#	code/modules/mob/mob.dm
2016-07-03 16:21:21 -04:00
Yoshax 33900c60f2 Makes flashes confuse and blind the person instead of stunning 2016-07-01 20:07:20 +01:00
Datraen ccda51ab68 Adds fluff antag factions, antag visibility options for uplinks.
No mechanical changes come of this change, only the ability to have an antagonist faction, as well as having specified visbility for the affiliation itself.
Also adds Skrell home system to the home system list.
2016-06-29 11:25:52 -04:00
Richard D'angelo 7ab5220f64 510 Improved Overlays
Fixes auto blindness and no click on 510 servers, lessens the lag of
mesons and material scanners, and I suspect the general speed as well.

I only made it work for Polaris (and by extention, to our server, Eros),
and adapted it a bit.

Ported from:

https://github.com/Baystation12/Baystation12/commit/7c2cc890abf840b1a9967bc26c36581301e7229c
2016-06-18 15:50:10 -03:00
HarpyEagleandYoshax 58b87f1a4b Adds do_surgery() behaviour for various items
Heath scanners, autopsy scanners, syringes, hyposprays, droppers and bottles.
2016-06-17 19:06:56 +01: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
DatraenandGitHub 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 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
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
Yoshax f75d509e7f Ports event system from Bay 2016-06-01 22:05:04 +01:00
Arokha Sieyes 54272da167 Merge pull request #245 from VOREStation/sink
Synchronize With Polaris
2016-05-31 01:35:04 -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
Yoshax df0135ac2b Merge branch 'master' of https://github.com/PolarisSS13/Polaris into attackcall 2016-05-29 01:00:50 +01:00
EmperorJon 01b3182004 Merge pull request #1462 from Datraen/Xenobiology_2
Xenobio2
2016-05-28 21:32:18 +01:00
Yoshax cd9fdd228b Merge branch 'master' of https://github.com/PolarisSS13/Polaris into attackcall 2016-05-28 20:22:09 +01:00
Arokha SieyesandYoshax ea6754597e Ports Bay's Robolimb Changes (#1779)
* Consolidates copypasta for repairing robolimbs

Also prevents self-repairing a limb you are using to hold the tool

* Fixes robot organs becoming undamagable after reaching cap

* Fixes repairing with cable not using any cable, repairing with weldingtool not doing eyecheck

* Removes ORGAN_ROBOT and ORGAN_ASSISTED flags, fixes #13123

* Fixes damage to robotic limbs not triggering organ processing

At the same time, robotic limbs with damage don't need to process.
However, it's much safer to explicitly have robot limbs return 0 from
needs_process() instead of not rechecking bad external organs.

* Build on HarpyEagle changes to apply to Polaris

Had to apply the change from flag to an enumeration.

* Removes unneeded file

* Fix bruisepacks, remove heart

Well, the unused bay version of the heart anyway

* Tweaks examine, reverts isSynthetic

Reverted that because Bay doesn't use it the same way. Also changed Examine to not list every robo-limb on non-FBPs in red, but left them listed as normal per Spookerton
2016-05-28 14:12:19 +01:00
Arokha Sieyes 8230732453 Merge branch 'sync' of https://github.com/VOREStation/Polaris into 05192016_sync 2016-05-19 23:52:00 -04:00
Datraen bb7713b2a8 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into Slime_Rework_3
# Conflicts:
#	code/game/objects/items/devices/multitool.dm
2016-05-19 17:31:25 -04:00
Datraen ce6b574d67 Status as of 05-18-2016 2016-05-19 15:16:48 -04:00
SinTwo a39d2c5cc6 Fixes Note Keeper and empty message sending null 2016-05-19 14:17:12 -04:00